05f68e0 Merge branch 'f12/master' into f13/master

Merged and Committed by mso 13 years ago
1 file changed. 1 lines added. 1 lines removed.
    Merge branch 'f12/master' into f13/master
    
    Conflicts:
    	libass.spec
    
    sync f12 with f13.
    
        
file modified
+1 -1