8e49ef0 Merge branch 'f17' into f18

Merged and Committed by kiilerix 11 years ago
    Merge branch 'f17' into f18
    
    Conflicts:
    	freerdp.spec
    
        
file modified
+6 -1