Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Tue, 20 Mar 2012 18:56:00 +0000 (20:56 +0200)
committerPetri Lehtinen <petri@digip.org>
Tue, 20 Mar 2012 18:56:00 +0000 (20:56 +0200)
1  2 
doc/conf.py
src/jansson.h

diff --cc doc/conf.py
Simple merge
diff --cc src/jansson.h
Simple merge