Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 18 Nov 2011 11:06:59 +0000
changeset 1025 c1ee4cc36089
parent 1023 c7a801067441 (diff)
parent 1024 0b56a38520af (current diff)
child 1026 e419c8a4862b
child 1028 a08af90d2bcc
Merge with stable