Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 05 Jun 2012 00:20:53 +0100
changeset 1087 06fb629c6195
parent 1082 2ba350253f76 (diff)
parent 1086 a2e8ccb65224 (current diff)
child 1092 25db33023e4e
Merge with stable