Merge branch '1.0' into HEAD
authorPetri Lehtinen <petri@digip.org>
Tue, 8 Sep 2009 14:02:39 +0000 (17:02 +0300)
committerPetri Lehtinen <petri@digip.org>
Tue, 8 Sep 2009 14:02:39 +0000 (17:02 +0300)
commit55d25665395551e711fa7d971cf76c8acf0b17f1
tree981bcca69d805b4382ae1e51d8c4a76e0db1510f
parent7ee974e91c05d334b3a186937916bc843c537b8e
parent9cc6fbe58024d63473846ddb424a69b7efc03b90
Merge branch '1.0' into HEAD

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