From a71ff8a61d817f656aee6c4c2fd810e20f0cd4a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Apr 03 2011 15:51:32 +0000
Subject: Merge branch 'master' into el6


Conflicts:
	.gitignore
	python-anyjson.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index f1af0e7..2585b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 anyjson-0.2.4.tar.gz
+<<<<<<< HEAD
+=======
+/anyjson-0.3.tar.gz
+/anyjson-0.3.1.tar.gz
+>>>>>>> master
diff --git a/python-anyjson.spec b/python-anyjson.spec
index 3842a1f..811aaa2 100644
--- a/python-anyjson.spec
+++ b/python-anyjson.spec
@@ -5,7 +5,7 @@
 %global srcname anyjson
 
 Name:           python-%{srcname}
-Version:        0.3
+Version:        0.3.1
 Release:        1%{?dist}
 Summary:        Wraps the best available JSON implementation available
 
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Apr 03 2011 Fabian Affolter <fabian@bernewireless.net> - 0.3.1-1
+- Updated to new upstream version 0.3.1
+
 * Thu Jan 27 2011 Fabian Affolter <fabian@bernewireless.net> - 0.3-1
 - Updated to new upstream version 0.3
 
diff --git a/sources b/sources
index cd56ce9..bac814b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-28124eeb1a96e6631ae67bcb7a30ef48  anyjson-0.3.tar.gz
+2b53b5d53fc40af4da7268d3c3e35a50  anyjson-0.3.1.tar.gz
+