[json_diff: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/json_diff

[Matej Cepl]

commit f639d6b1175095cac8edba5a9db08ba1b4cbe755
Merge: 15921b0 45452ef
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Apr 24 01:56:08 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/json_diff
    
    Conflicts:
    	json_diff.spec

 json_diff.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc json_diff.spec
index 9c7cc07,45a6072..4fc3176
--- a/json_diff.spec
+++ b/json_diff.spec
@@@ -51,9 -51,9 +51,12 @@@ rm -rf %{buildroot
  %{python_sitelib}/*
  
  %changelog
 +* Tue Apr 24 2012 'Matej Cepl <mcepl at redhat.com>' - 1.3.1-1
 +- New upstream release (optional output file)
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Nov 30 2011 Matěj Cepl <mcepl at redhat.com> 1.2.2-1
  - New upstream release (exit code)
  - Make tests independent of the current locale (including on RHEL 5)