Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 19 Jun 2012 16:00:31 +0100
changeset 1103 9459951761fb
parent 1097 7f458d071b49 (diff)
parent 1102 51afb47e2399 (current diff)
child 1111 df702ad9b314
Merge with stable