Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py

diff --cc configure.ac
index 4020469,5df7d77..d28a5e4
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.59])
- AC_INIT([jansson], [1.1.2+], [petri@digip.org])
 -AC_INIT([jansson], [1.1.3], [petri@digip.org])
++AC_INIT([jansson], [1.1.3+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --cc doc/conf.py
index c13315a,377e75d..10f444d
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -52,7 -52,7 +52,7 @@@ copyright = u'2009, Petri Lehtinen
  # The short X.Y version.
  version = '1.1'
  # The full version, including alpha/beta/rc tags.
- release = '1.1.2+'
 -release = '1.1.3'
++release = '1.1.3+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --cc src/dump.c
Simple merge

diff --cc src/load.c
Simple merge