2ce1bf7 Merge remote branch 'origin/f13/master' into f12/master

Merged and Committed by rdieter 13 years ago
1 file changed. 10 lines added. 1 lines removed.
    Merge remote branch 'origin/f13/master' into f12/master
    
    Conflicts:
    	kdeedu.spec
    
        
file modified
+10 -1