Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Mon, 30 Jan 2012 19:23:49 +0000 (21:23 +0200)
committerPetri Lehtinen <petri@digip.org>
Mon, 30 Jan 2012 19:23:49 +0000 (21:23 +0200)
commit60fd7ab781b62bb4d42edcfaea627b1b34cc06bd
tree0820d8cdb5049d33c7792478b7affbe627ea2734
parenta894980258289fc20be7283f9b8b8221195fa714
parent0d64e8ef89d0dbfb582a07fb1b02c0d301100d32
Merge branch '2.3'