Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py

diff --cc configure.ac
index 2835ad3,009e0fb..c2de72f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
- AC_PREREQ([2.63])
- AC_INIT([jansson], [1.0.3+], [petri@digip.org])
+ AC_PREREQ([2.59])
 -AC_INIT([jansson], [1.0.4], [petri@digip.org])
++AC_INIT([jansson], [1.0.4+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --cc doc/conf.py
index 3ccd920,355c72f..16d9c80
--- 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.3+'
 -release = '1.0.4'
++release = '1.0.4+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --cc src/Makefile.am
index a737c90,9c4d3f8..36f8467
--- 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:3:0
+ libjansson_la_LDFLAGS = -version-info 0:4:0
  
 -AM_CFLAGS = -Wall -Wextra -Werror -std=c99
 +AM_CFLAGS = -Wall -Wextra -Werror

diff --cc src/dump.c
Simple merge

diff --cc src/load.c
Simple merge