Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 24 Sep 2013 03:12:59 +0100
changeset 1294 5a04f94e1da9
parent 1291 451cbdc0b353 (diff)
parent 1293 6e9bfd51bc6f (current diff)
child 1296 115d2b6a8a9c
Merge with stable