9178dda Merge branch 'master' into el6

Merged and Committed by scop 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	libmodplug.spec
    	sources
    
        
file modified
+1 -1
file modified
+9 -3
file modified
+1 -1