Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 11 Oct 2012 19:46:25 +0200
changeset 1140 689f8b6b711c
parent 1137 2d9daef1e473 (diff)
parent 1139 cdabdd17f980 (current diff)
child 1141 4e2090ed2e72
Merge with stable