Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py

diff --cc configure.ac
index 3a35945,1a6f7e7..8de9c05
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.59])
- AC_INIT([jansson], [1.1.1+], [petri@digip.org])
 -AC_INIT([jansson], [1.1.2], [petri@digip.org])
++AC_INIT([jansson], [1.1.2+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --cc doc/conf.py
index 02b4c79,be257e1..c13315a
--- 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.1+'
 -release = '1.1.2'
++release = '1.1.2+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --cc src/jansson.h
Simple merge