4a2714e Merge branch 'master' into f19

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	clementine.spec
    
        
file modified
+4 -1