Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 8 Mar 2012 13:03:03 +0000 (15:03 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 8 Mar 2012 13:03:03 +0000 (15:03 +0200)
commit1eb274c55592c8a0097a88312ab06b02b096da96
tree147a2b44f53a366e5566d5a50ff025441a6f406d
parentf736e705b27ab6a26556beb0cc972fc56e8ae8a7
parent6ac6f311b5548479d9510bfb672917739527bad3
Merge branch '2.3'