Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Tue, 20 Mar 2012 18:48:36 +0000 (20:48 +0200)
committerPetri Lehtinen <petri@digip.org>
Tue, 20 Mar 2012 18:48:36 +0000 (20:48 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge