69b1e20 Merge branch 'master' into f19

Merged and Committed by Dan Mashal 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	gnome-icon-theme.spec
    
        
file modified
+41 -19