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)
commitd286e7b753d26ca26479629952c53e2a89fb8fba
tree509329d57e1b2fafd571c80266cf69609266f303
parent9af64480e19184b640a68b019a639fa1d9418582
parent3c6e36ba2df25121538753e20fcf2b2043ca67af
Merge branch '2.3'
doc/conf.py
src/jansson.h