38cb511 Merge remote-tracking branch 'origin/f15' into f14

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