Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 05 Aug 2013 13:19:38 +0100
changeset 1291 451cbdc0b353
parent 1288 2e9c41125820 (diff)
parent 1290 d56f50372ba5 (current diff)
child 1294 5a04f94e1da9
Merge with stable