f29b368 Merge remote-tracking branch 'origin/master'

Merged and Committed by ajax 10 years ago
    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	xorg-x11-server.spec
    
        
file modified
+7 -1