40b9f34 Merge branch 'master' of ssh://pkgs.fedoraproject.org/tulrich-tuffy-fonts

Merged and Committed by toshio 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/tulrich-tuffy-fonts
    
    Conflicts:
    	tulrich-tuffy-fonts.spec
    
        
file modified
+5 -0