e382c2a Merge branch 'master' of ssh://pkgs.fedoraproject.org/kanjistrokeorders-fonts

Merged and Committed by Paul Flo Williams 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kanjistrokeorders-fonts
    
    Conflicts:
    	kanjistrokeorders-fonts.spec
    
        
file modified
+9 -0