Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 22 Jun 2012 13:40:23 +0100
changeset 1113 1e477be3b6c8
parent 1111 df702ad9b314 (diff)
parent 1112 3007e5d9eb4e (current diff)
child 1114 22b300b7a7c1
Merge with stable