[python-bunch: 6/6] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-bunch Merge master

[Toshio くらとみ]

commit fd7021a8d073942d2dd46733c4d8107080620bf6
Merge: c53a2bc 5e7d68f
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Dec 29 08:47:51 2011 -0800

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-bunch
    Merge master
    
    Conflicts:
    	python-bunch.spec

 python-bunch.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc python-bunch.spec
index cd03e93,0255417..c0ba9bf
--- a/python-bunch.spec
+++ b/python-bunch.spec
@@@ -65,11 -67,11 +65,15 @@@ PYTHONPATH=build/lib python build/lib/b
  
  
  %changelog
 +* Thu Dec 29 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.1-1
 +- New upstream release that adds pyyaml and json serialization
 +
- * Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.0-2
- - Fix build when fedora macro is not defined.
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
++
+ * Fri Jul 30 2010 Toshio Kuraotmi <toshio at fedoraproject.org> - 1.0.0-2
+ - Rebuild for python-2.7
  
  * Fri Mar 19 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.0-1
  - Initial Fedora Build