Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Sun, 28 Mar 2010 18:44:41 +0000 (21:44 +0300)
committerPetri Lehtinen <petri@digip.org>
Sun, 28 Mar 2010 18:44:41 +0000 (21:44 +0300)
commit4e63fcd55d874485071073f181dbfc5b9e196600
tree8c1aa0262a7ee2cdd6cc5c56b06b76660fd2d45e
parent49880cbabeb597a9c748a3d5f37e9961a084dce3
parent024106bbfbd7376656876aa8bd00a333d5ada10c
Merge branch '1.2'

Conflicts:
configure.ac
.gitignore
configure.ac
src/hashtable.c
src/jansson.h.in
src/value.c