Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Thu, 4 Feb 2010 19:13:57 +0000 (21:13 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 4 Feb 2010 19:13:57 +0000 (21:13 +0200)
Conflicts:
LICENSE


No differences found