981ea86 Merge branch 'master' into f18

Merged and Committed by Rex Dieter 11 years ago
1 file changed. 18 lines added. 5 lines removed.
    Merge branch 'master' into f18
    
    Conflicts:
    	kdeutils.spec
    
        
file modified
+18 -5