7a834cd Merge branch 'el6' into el5

Merged and Committed by kiilerix 11 years ago
    Merge branch 'el6' into el5
    
    Conflicts:
    	freerdp.spec
    
        
file modified
+2 -0
file modified
+45 -6
file modified
+2 -1