4357be6 Merge branch 'master' into f17

Merged and Committed by Dan Vrátil 10 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	libkscreen.spec
    	sources
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1