dd37478 Merge branch 'master' into f22

Merged and Committed by Dan Vrátil 9 years ago
    Merge branch 'master' into f22
    
    Conflicts:
    	kf5-kglobalaccel.spec
    
        
file modified
+1 -3