Merge branch '1.1'
authorPetri Lehtinen <petri@digip.org>
Mon, 26 Oct 2009 19:33:03 +0000 (21:33 +0200)
committerPetri Lehtinen <petri@digip.org>
Mon, 26 Oct 2009 19:33:03 +0000 (21:33 +0200)
commitd1b07171cc1e54addfdc18b2d528487596ff535d
treee11b8495ae661fbc87ca7840f0765ab4a39afb63
parent5ff8ae8052fcd179bc919e9ed3c7b699a80b8c27
parent15d992cb6a6eeab8c2f4c7d00fa06a52fca62287
Merge branch '1.1'

Conflicts:
CHANGES
configure.ac
doc/conf.py
configure.ac
doc/conf.py