Merge branch '1.0'
authorPetri Lehtinen <petri@digip.org>
Sun, 11 Oct 2009 18:51:54 +0000 (21:51 +0300)
committerPetri Lehtinen <petri@digip.org>
Sun, 11 Oct 2009 18:51:54 +0000 (21:51 +0300)
commitca7703fbd127a6279e9842a843f317a639db87e2
tree60438f2bd9b15897775bb54faeea5f54dab13d0e
parent1e00cd58a514a61e829e639f1e40dac94a334561
parent12cd4e8c093476b596012a7f5f4840fac69d1605
Merge branch '1.0'

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