Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Sat, 12 Jun 2010 19:44:21 +0000 (22:44 +0300)
committerPetri Lehtinen <petri@digip.org>
Sat, 12 Jun 2010 19:45:45 +0000 (22:45 +0300)
commit8b2b12e05fdcb14c19bf2fc31223838b417354cd
tree80b4d0b10587dfe376baf6c1b732124bb1d68ab1
parentdec3ad498ee52c3b2860b14b4bbe626cd0f8f495
parent1a090bbcd3ce95260ee5a69f0e21bc50f655b606
Merge branch '1.2'