0c348ed Merge branch 'master' into f17

Merged and Committed by than 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	gwenview.spec
    	sources
    
        
file modified
+1 -0
file modified
+25 -8
file modified
+1 -1