Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 06:00:49 +0000 (09:00 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 06:00:49 +0000 (09:00 +0300)
commit4a6939ef877e5c67d79061fac65d6610cb33305d
treecfaef52d723dc9d64a262287a031b1857dfcb9c0
parentabdb8d99d792de7c40b76552d38a7926ff7f8d58
parent42bc7a3c50e04a44765809a33531539350b37a77
Merge branch '2.3'