bc0ea2f Merge remote branch 'origin/f12/master'

Merged and Committed by rathann 13 years ago
    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	mkvtoolnix.spec
    	sources
    
        
file modified
+2 -0
file modified
+4 -0