2070df Merge branch 'master' into f18

Merged and Committed by Rex Dieter 6 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	pykde4.spec
    	sources
    
        
file modified
+1 -6
file modified
+52 -37
file modified
+1 -1