Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Thu, 31 Mar 2011 18:26:19 +0000 (21:26 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 31 Mar 2011 18:26:19 +0000 (21:26 +0300)
commit4a76900bd7f52ddaea44bd81a2666a4378a553f6
treefe898ac703c0c2b6b624e93bb7ec5c6d95c90b2c
parent056702e541b7b977cc5109113fa25bc580c7bdf3
parent1c0a3b2a556be9800e307413d41d4f040d1db062
Merge branch '2.0'

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