[json_diff/el6: 6/6] Merge branch 'master' into el6

[Matej Cepl]

commit 77abb2a91fa472640fa898ecad8f1a9e0ec7fbf3
Merge: a966900 d789843
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Apr 24 06:59:14 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	json_diff.spec
    	sources

 .gitignore     |    2 ++
 json_diff.spec |   10 ++++++++--
 sources        |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index a9c7062,250415e..97c2651
--- a/.gitignore
+++ b/.gitignore
@@@ -5,5 -5,5 +5,7 @@@
  /json_diff-1.2.1.tar.gz
  /json_diff-1.2.2.tar.gz
  /json_diff-1.2.3.tar.gz
 +/json_diff-1.2.8.tar.gz
 +/json_diff-1.2.9.tar.gz
+ /json_diff-1.3.1.tar.gz
+ /json_diff-1.3.2.tar.gz
diff --cc json_diff.spec
index 83602b7,b545419..72cfed5
--- a/json_diff.spec
+++ b/json_diff.spec
@@@ -51,9 -51,12 +51,15 @@@ rm -rf %{buildroot
  %{python_sitelib}/*
  
  %changelog
+ * Tue Apr 24 2012 'Matej Cepl <mcepl at redhat.com>' - 1.3.1-2
+ - New upstream release (optional output file)
+ 
 +* Mon Feb 13 2012 'Matej Cepl <mcepl at redhat.com>' - 1.2.9-1
 +- New upstream releases.
 +
+ * 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)