Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 22 Mar 2012 07:02:51 +0000 (09:02 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 22 Mar 2012 07:02:51 +0000 (09:02 +0200)
commit17a51a4bf0edc66a2574892ff7cbea887370d17f
tree6864b54b3a2bff5ce8d30a2e091b086fd8cbc5fe
parent09c39adc55f16dd986a38cb621144cb0229ffc92
parent2637faa4509c78ac1463c7924f6e9f7cd96ed5d8
Merge branch '2.3'