Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 18 May 2011 23:30:45 +0200
changeset 952 eb6ebe425bf6
parent 950 d93ca857e4bb (diff)
parent 951 0af8a73dfe14 (current diff)
child 954 12a2b9b99beb
Merge with stable