094fae0 Merge branch 'master' into f17

Merged and Committed by rdieter 11 years ago
1 file changed. 22 lines added. 3 lines removed.
    Merge branch 'master' into f17
    
    Conflicts:
    	kdeedu.spec
    
        
file modified
+22 -3