Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 10 Oct 2012 11:31:01 +0200
changeset 1137 2d9daef1e473
parent 1134 183d7e3d7ce8 (diff)
parent 1136 294cea906d3a (current diff)
child 1140 689f8b6b711c
Merge with stable