Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 19:11:22 +0000 (22:11 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 19:11:22 +0000 (22:11 +0300)
commit4601bf71e532c7a0be2f468521e54e86666c6c63
tree710aaf896bd832db23fdd116a244a471bec34540
parentf309e30320fbc4b6bfaa5fb8dc57384a5ddcdcdd
parentc7f86abf6d1f96c0fce0b0ab5be5a74972ae84f5
Merge branch '2.3'