Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Wed, 6 Jun 2012 18:10:28 +0000 (21:10 +0300)
committerPetri Lehtinen <petri@digip.org>
Wed, 6 Jun 2012 18:10:28 +0000 (21:10 +0300)
commit6ce273e2e65d1ea9e09e0dad3265dc5f3a2b746a
tree8462aa139137d13d1836ac9223f1ff2ebc2b647c
parentc0139681cdaf95c40ac274ede69f415d489dba0a
parentf62b1f5d696a196a4fe97b52da7cc9777e648ab0
Merge branch '2.3'