Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py

diff --cc configure.ac
index 783e264,44535ff..f7fe011
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.63])
- AC_INIT([jansson], [1.0+], [petri@digip.org])
 -AC_INIT([jansson], [1.0.1], [petri@digip.org])
++AC_INIT([jansson], [1.0.1+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --cc doc/conf.py
index 7629a03,0aaee33..bd88c6b
--- 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.0'
  # The full version, including alpha/beta/rc tags.
- release = '1.0+'
 -release = '1.0.1'
++release = '1.0.1+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --cc src/Makefile.am
index 7446fc8,e6264d5..50b1e69
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -13,6 -13,6 +13,6 @@@ libjansson_la_SOURCES = 
        utf.h \
        util.h \
        value.c
- libjansson_la_LDFLAGS = -version-info 0:0:0
+ libjansson_la_LDFLAGS = -version-info 0:1:0
  
 -AM_CFLAGS = -Wall -Wextra -Werror -std=c99
 +AM_CFLAGS = -Wall -Wextra -Werror

diff --cc src/jansson.h
Simple merge