Merge branch '2.3'

Conflicts:
	configure.ac
	doc/conf.py
	src/jansson.h

diff --git a/CHANGES b/CHANGES
index f044f74..2a36b4f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,28 @@
+Version 2.3.1
+=============
+
+Released 2012-04-20
+
+* Build issues:
+
+  - Only use ``long long`` if ``strtoll()`` is also available.
+
+* Documentation:
+
+  - Fix the names of library version constants in documentation. (#52)
+
+  - Change the tutorial to use GitHub API v3. (#65)
+
+* Tests:
+
+  - Make some tests locale independent. (#51)
+
+  - Distribute the library exports test in the tarball.
+
+  - Make test run on shells that don't support the ``export FOO=bar``
+    syntax.
+
+
 Version 2.3
 ===========
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 80c03de..22bc053 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ libjansson_la_SOURCES = \
        value.c
 libjansson_la_LDFLAGS = \
        -export-symbols-regex '^json_' \
-       -version-info 7:0:3
+       -version-info 7:1:3
 
 if GCC
 # These flags are gcc specific