Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 23 Jan 2013 22:30:58 +0000
changeset 1207 c762ba67e444
parent 1205 531804688bf5 (diff)
parent 1206 9fb4b2c19bd8 (current diff)
child 1209 49ca5f6f1a95
Merge with stable