Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Sun, 12 Feb 2012 14:05:35 +0000 (16:05 +0200)
committerPetri Lehtinen <petri@digip.org>
Sun, 12 Feb 2012 14:05:35 +0000 (16:05 +0200)
commitf736e705b27ab6a26556beb0cc972fc56e8ae8a7
treec6f1102d20a7b4b7ba9f74e247d2d462830558cd
parent98a99fb2bd650d8b28be1ae3e2687f3e81c4c03c
parent54d88753a6b33770a1c756921fee68c7d9421bba
Merge branch '2.3'