Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Wed, 18 Apr 2012 18:59:10 +0000 (21:59 +0300)
committerPetri Lehtinen <petri@digip.org>
Wed, 18 Apr 2012 18:59:10 +0000 (21:59 +0300)
commit8b2bfd55863f8e6604a9750beaac87ae4047b499
treef9536346bb05a7d8feff3ec5ac4c17d55c39352a
parent1581f26a7fd2158b8b0149bbd95e9fb42d68a902
parente46b912f53eac00816fffd7774fe0cea113550bc
Merge branch '2.3'