Merge branch 'master' into iterable_as_array-gh1

Conflicts:
	CHANGES.txt
	conf.py
	index.rst
	setup.py
	simplejson/__init__.py
	simplejson/_speedups.c
	simplejson/encoder.py
	simplejson/tests/test_tuple.py

1 files changed, 3 insertions, 3 deletions

diff --git a/conf.py b/conf.py
index 4b4537a..9156dca 100644
--- a/conf.py
+++ b/conf.py
@@ -36,15 +36,15 @@ master_doc = 'index'
 
 # General substitutions.
 project = 'simplejson'
-copyright = '2011, Bob Ippolito'
+copyright = '2015, Bob Ippolito'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '2.3'
+version = '3.7'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.0'
+release = '3.7.4'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used: