Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Tue, 5 Apr 2011 12:38:37 +0000 (15:38 +0300)
committerPetri Lehtinen <petri@digip.org>
Tue, 5 Apr 2011 12:38:37 +0000 (15:38 +0300)
commit76d6d700ad15bab9234f7b8d94fa7df1fa5f16c0
treec3076daada4841603648f4c2bfe97b001441baa6
parent4a76900bd7f52ddaea44bd81a2666a4378a553f6
parentc96763215dddce8fbd6f785b9c841b5d97458d41
Merge branch '2.0'