3bf300f Merge branch 'master' into f19

Merged and Committed by Dan Mashal 11 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	mate-control-center.spec
    	sources
    
        
file modified
+4 -0
file modified
+27 -47
file modified
+4 -0