Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 16 Nov 2011 12:55:59 +0000
changeset 1023 c7a801067441
parent 1021 4ecaec765d76 (diff)
parent 1022 34ebea1c49c9 (current diff)
child 1025 c1ee4cc36089
Merge with stable