Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Sun, 12 Feb 2012 14:05:35 +0000 (16:05 +0200)
committerPetri Lehtinen <petri@digip.org>
Sun, 12 Feb 2012 14:05:35 +0000 (16:05 +0200)

Trivial merge