Merge branch '1.0'
authorPetri Lehtinen <petri@digip.org>
Sun, 6 Sep 2009 09:53:38 +0000 (12:53 +0300)
committerPetri Lehtinen <petri@digip.org>
Sun, 6 Sep 2009 09:53:38 +0000 (12:53 +0300)
commitfd259ff68c095c613acf952cc63407f294241923
tree7a6f444415386d8019e51c9604c21a42159b9272
parent9611780907cdb0154bd41232df7b2a41903a4ca5
parentab2d93b72486eda30e868b226bec5dcd5ec3273e
Merge branch '1.0'

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