Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 19 Sep 2012 00:59:23 +0100
changeset 1134 183d7e3d7ce8
parent 1132 13a3f6161af8 (diff)
parent 1133 82f74372516e (current diff)
child 1137 2d9daef1e473
Merge with stable