Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Wed, 21 Mar 2012 12:03:49 +0000 (14:03 +0200)
committerPetri Lehtinen <petri@digip.org>
Wed, 21 Mar 2012 12:03:51 +0000 (14:03 +0200)
Closes #56.


Trivial merge