Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 10 Jun 2012 16:32:22 +0100
changeset 1092 25db33023e4e
parent 1087 06fb629c6195 (diff)
parent 1091 15dc93f78ecd (current diff)
child 1097 7f458d071b49
Merge with stable