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

[Matej Cepl]

commit d5060d290d836f70accf33373f4df178540eac27
Merge: 77abb2a d242a6a
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Apr 24 10:23:22 2012 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 json_diff.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 97c2651,92a8d8f..5a4f667
--- a/.gitignore
+++ b/.gitignore
@@@ -5,7 -5,6 +5,8 @@@
  /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
+ /json_diff-1.3.3.tar.gz