3146094 Merge branch 'f18' into f17

Merged and Committed by Rex Dieter 11 years ago
    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore
    	calligra.spec
    	sources
    
        
file modified
+1 -1
file modified
+13 -1
file modified
+1 -1