d088e1f Merge branch 'master' into f21

Merged and Committed by bojan 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	xrdp.spec
    
        
file modified
+17 -23