Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Thu, 28 Jan 2010 19:05:19 +0000 (21:05 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 28 Jan 2010 19:05:19 +0000 (21:05 +0200)
commit72e39484383c3a628d350b64c6f83db81ee86a0c
tree39f1241ac377f5086413faef71d3e749cb4077ff
parent04f7e278777048b7ab35305d03e74f141519cd0c
parentf5662a82cd8fc4d5f43123ed81e5d4b7d5e34bb4
Merge branch '1.2'