Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Sat, 3 Apr 2010 11:00:59 +0000 (14:00 +0300)
committerPetri Lehtinen <petri@digip.org>
Sat, 3 Apr 2010 11:00:59 +0000 (14:00 +0300)
commit8857aeadfdbe1923f229ab5a4b4c371986a8de2e
treed8a8c13d3b239f3538c4d7d29d3fbea9aa9baf78
parent4e63fcd55d874485071073f181dbfc5b9e196600
parent047a1417fb4f09f995eb2671ee52253f7f1e1e76
Merge branch '1.2'

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