Merge branch '1.3'
authorPetri Lehtinen <petri@digip.org>
Mon, 6 Sep 2010 17:48:25 +0000 (20:48 +0300)
committerPetri Lehtinen <petri@digip.org>
Mon, 6 Sep 2010 17:48:25 +0000 (20:48 +0300)
commit781bda140418821ad79ef513b0fd8cfbc0ce552e
tree97148a60bd0b4e78cfa2c4d6802f456644e1292f
parent8567816542e23860ca7d162e1da319e71b6d4f69
parent3d5c0f46f10bcb26f054af9ab2cf1d910148f9d5
Merge branch '1.3'