Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 02 Apr 2012 17:28:55 +0100
changeset 1058 3639efa7216a
parent 1054 671c1a0be907 (diff)
parent 1057 66d2754c6f30 (current diff)
child 1060 2d2d93380694
Merge with stable