Merge branch '1.1'
authorPetri Lehtinen <petri@digip.org>
Wed, 4 Nov 2009 20:10:46 +0000 (22:10 +0200)
committerPetri Lehtinen <petri@digip.org>
Wed, 4 Nov 2009 20:10:46 +0000 (22:10 +0200)
commit17d913307e60d1c3e41d01d9a4be81892d610b3f
treeacfc2909da35a08488ee934ce543c0ebf172038c
parentf236c14dc5457a41119492ebce41b8920fd31f65
parentd3959a8ce79bb30a8b39a275a4682885e97d17cc
Merge branch '1.1'

Conflicts:
test/.gitignore
test/testprogs/Makefile.am
test/.gitignore
test/testprogs/Makefile.am