bb7ecaf Merge remote-tracking branch 'origin/master' into f14

Merged and Committed by Jaroslav Reznik 13 years ago
    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kde-l10n.spec
    	sources
    
        
file modified
+106 -55
file modified
+139 -88
file modified
+53 -56
file modified
+1 -3