Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 2 Feb 2012 15:03:03 +0000 (17:03 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 2 Feb 2012 15:03:03 +0000 (17:03 +0200)
commit98a99fb2bd650d8b28be1ae3e2687f3e81c4c03c
tree829d15f3359da27fe6c2b3d8695c7565f0774a43
parent60fd7ab781b62bb4d42edcfaea627b1b34cc06bd
parentac97f6f225f85084770a26a8fddfb2a35232fb4e
Merge branch '2.3'