Merge branch '1.3'
authorPetri Lehtinen <petri@digip.org>
Sat, 14 Aug 2010 18:02:08 +0000 (21:02 +0300)
committerPetri Lehtinen <petri@digip.org>
Sat, 14 Aug 2010 18:02:08 +0000 (21:02 +0300)
commit56643d4311ecb26001527520da6264d92eab3d76
treeb5ff0c8da7d24671d963ebcb3c2600a38bcfabae
parentcb8fcc780894420ab85bfd5e80ed274999c4161f
parent145032a57f7844c29f2c40415b46338ac3445207
Merge branch '1.3'

Conflicts:
doc/apiref.rst
src/jansson_private.h
configure.ac
doc/apiref.rst
doc/conformance.rst
src/Makefile.am
src/jansson.h
src/jansson_private.h
src/value.c