Merge branch '1.1'
authorPetri Lehtinen <petri@digip.org>
Sun, 20 Dec 2009 19:18:27 +0000 (21:18 +0200)
committerPetri Lehtinen <petri@digip.org>
Mon, 21 Dec 2009 10:52:25 +0000 (12:52 +0200)
commite7a5dc58e630aa079f402b46a65d218e656dd489
treea4b36a00e6f569c8630d7ff2b7071ef640d3d7e5
parent3889af476ba52e98de210e8e0b3b4a44a26b3a60
parent34fb97998cfeb4ae6f4bc9450c9144bd7572c1f6
Merge branch '1.1'

Conflicts:
configure.ac
doc/conf.py
configure.ac
doc/conf.py
src/dump.c
src/load.c