2c22cc9 Merge branch 'master' into f18

Merged and Committed by rdieter 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	mate-terminal.spec
    
        
file modified
+1 -0
file modified
+0 -1