Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Fri, 27 Jul 2012 04:28:40 +0000 (07:28 +0300)
committerPetri Lehtinen <petri@digip.org>
Fri, 27 Jul 2012 04:28:40 +0000 (07:28 +0300)
commit52924288b922c1b0c439e2b1bbb3006093a6486b
treec7f0d20a7f230dc711f225c3f1ed3092f418a65c
parenta501a39626edf39f5449c6bd4d65656d1b2ccb6c
parent7892ecce1c220c4d2bdffa2dbe1c8afe046d3509
Merge branch '2.3'