Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 03 Apr 2012 16:34:50 +0100
changeset 1060 2d2d93380694
parent 1058 3639efa7216a (diff)
parent 1059 1745fd2dd308 (current diff)
child 1062 3c257fefa53d
Merge with stable