Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Thu, 31 Mar 2011 13:39:33 +0000 (16:39 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 31 Mar 2011 13:39:33 +0000 (16:39 +0300)
commit056702e541b7b977cc5109113fa25bc580c7bdf3
treecb2eee6af37e93d5da2f63f4cc763641c6f8e5ca
parenta5a43caa9a92a9c20a0b7ab6efce33106850895a
parenteab23f05d873a7099f355ad937c9b8522abcc18e
Merge branch '2.0'