Merge branch '1.0'
authorPetri Lehtinen <petri@digip.org>
Mon, 14 Sep 2009 12:06:06 +0000 (15:06 +0300)
committerPetri Lehtinen <petri@digip.org>
Mon, 14 Sep 2009 12:06:06 +0000 (15:06 +0300)
commit7728716759b73ee95b84c33a922bdc628dc7d2a9
tree622b70df977d32e726fede31bb16698f2b575665
parent5406c2b3d347505149d382213b6f318f8c35de6a
parentb7bf96996f4db14c75499ddb529d5017893ad294
Merge branch '1.0'

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