1dee758 Merge branch 'f15' into f14

Merged and Committed by Ian Weller 11 years ago
    Merge branch 'f15' into f14
    
    Conflicts:
    	.gitignore
    	abattis-cantarell-fonts.spec
    	sources
    
        
file modified
+3 -0
file modified
+13 -8
file modified
+1 -1