Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 16 Jan 2013 20:56:02 +0000
changeset 1202 e475cc6eff08
parent 1192 5eb5ba3b9e99 (diff)
parent 1201 6f2f7246e4be (current diff)
child 1205 531804688bf5
Merge with stable