Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Fri, 20 Apr 2012 18:41:25 +0000 (21:41 +0300)
committerPetri Lehtinen <petri@digip.org>
Fri, 20 Apr 2012 18:41:25 +0000 (21:41 +0300)
commitabdb8d99d792de7c40b76552d38a7926ff7f8d58
tree03887c68f0f2fc0d301da453bcaaab5d3cfbc8bf
parent8b2bfd55863f8e6604a9750beaac87ae4047b499
parentff6e6ee293fc31df0ad6f0b74c4a61294b370df0
Merge branch '2.3'

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