Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Fri, 7 May 2010 04:36:01 +0000 (07:36 +0300)
committerPetri Lehtinen <petri@digip.org>
Fri, 7 May 2010 04:36:01 +0000 (07:36 +0300)
commit782acfe378b8d6dddb307029ba97688943312340
treec811220e73069ba502f0e342e142dae7a8cdb692
parent8857aeadfdbe1923f229ab5a4b4c371986a8de2e
parentf9475f9577bd62b4e1586fbefcbcf70a460b9e61
Merge branch '1.2'