7075647 Merge branch 'master' into f12/master

Merged and Committed by Fedora 13 years ago
    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	shutter.spec
    	sources
    
        
file removed
-1
file modified
+7 -2
file modified
+2 -1