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

[Toshio くらとみ]

commit a84124b507f0014e2d5de67cc0cf9ad3755818bc
Merge: 288449e 5fb3308
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sat Apr 30 07:56:43 2011 -0700

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

 python-simplejson.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-simplejson.spec
index 4a1ed62,99c7b21..fa4b30c
--- a/python-simplejson.spec
+++ b/python-simplejson.spec
@@@ -73,9 -73,9 +73,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Tue Jan 18 2011 Toshio Kuratomi <toshoi at fedoraproject.org> - 2.1.5-1
 +- Update to 2.1.5, trivial upstream release (change makes more compact output)
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Jan 18 2011 Toshio Kuratomi <toshoi at fedoraproject.org> - 2.1.3-1
  - Update to 2.1.3