Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Thu, 4 Feb 2010 19:13:57 +0000 (21:13 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 4 Feb 2010 19:13:57 +0000 (21:13 +0200)
commit8d75235ff22dc4aced697e198c3c024f1f4b88fe
treeb421270cf5e2231cf2bf5898864942de0e6226a6
parent79e9dae9a0694fa62d89d6b5eed4691497ddaee0
parent08dc8d9bafcb13bb1541894918f4a394e644e6e1
Merge branch '1.2'

Conflicts:
LICENSE
src/hashtable.c
src/hashtable.h
src/jansson.h
src/value.c
test/suites/api/run
test/suites/api/test_object.c