963f3fc Merge branch 'master' into f19

Merged and Committed by greghellings 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	mingw-libgsf.spec
    	sources
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1