42a769e Merge branch 'master' into f18

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