f547f2 Merge ../fontforge into el5

Merged and Committed by Jon Ciesla 11 years ago
    Merge ../fontforge into el5
    
    Conflicts:
    	.gitignore
    	fontforge.spec
    	sources
    
        
file modified
+2 -2
file modified
+1 -0
file modified
+100 -30
file added
+11
file modified
+2 -2