4a9bf45 Merge commit '5f39594bbcfaadc911978fef80392cdc3c1e4714' into f17

Merged and Committed by Rex Dieter 11 years ago
    Merge commit '5f39594bbcfaadc911978fef80392cdc3c1e4714' into f17
    
    Conflicts:
    	.gitignore
    	calligra.spec
    	sources
    
        
file modified
+1 -1
file modified
+113 -39
file modified
+1 -1