Merge branch '2.2'
authorPetri Lehtinen <petri@digip.org>
Mon, 14 Nov 2011 19:16:42 +0000 (21:16 +0200)
committerPetri Lehtinen <petri@digip.org>
Mon, 14 Nov 2011 19:16:42 +0000 (21:16 +0200)
commitbb24697d9b83371a8687f54edfc5d624b7c4d80d
treeb6fe9b496d784c99f0d3ca015571b7a6dad746d5
parentbef87fc2581bf2ca6bdacecc0673badb749dcd7f
parentc4a7bf90cf7a1b6fb1c701e2d071d1e236259e70
Merge branch '2.2'