[kanjistrokeorders-fonts: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/kanjistrokeorders-fonts

[Paul Flo Williams]

commit e382c2a86d6bbf1b83713117eab7d9eccba52aef
Merge: 37a1a17 4c2110b
Author: Paul Flo Williams <paul at frixxon.co.uk>
Date:   Mon Sep 22 18:25:32 2014 +0100

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

 kanjistrokeorders-fonts.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc kanjistrokeorders-fonts.spec
index cf4508e,249f957..ea0d3d3
--- a/kanjistrokeorders-fonts.spec
+++ b/kanjistrokeorders-fonts.spec
@@@ -58,9 -58,15 +58,18 @@@ rm -rf ${RPM_BUILD_ROOT
  
  
  %changelog
 +* Mon Sep 22 2014 Paul Flo Williams <paul at frixxon.co.uk> - 3.001-1
 +- New upstream version, with additions and improvements to about 40 characters
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.000-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.000-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.000-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Tue Oct 23 2012 Paul Flo Williams <paul at frixxon.co.uk> - 3.000-1
  - New upstream version