56ebb0b Merge remote-tracking branch 'origin/master' into f15

Merged and Committed by rdieter 12 years ago
1 file changed. 15 lines added. 4 lines removed.
    Merge remote-tracking branch 'origin/master' into f15
    
    Conflicts:
    	kdevelop.spec
    
        
file modified
+15 -4