Merge branch '1.1'
authorPetri Lehtinen <petri@digip.org>
Sun, 8 Nov 2009 20:01:02 +0000 (22:01 +0200)
committerPetri Lehtinen <petri@digip.org>
Sun, 8 Nov 2009 20:01:02 +0000 (22:01 +0200)
commite0a88d19d1f103c32bbaf4c20a83575413c4bf80
tree8ae7bd04df1adec1e5f1824f0ba0ecc93054be51
parent17d913307e60d1c3e41d01d9a4be81892d610b3f
parent842bc2128b70e5390cacf83a24375cd5c0d0341c
Merge branch '1.1'

Conflicts:
configure.ac
doc/conf.py
configure.ac
doc/conf.py
src/jansson.h