Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 19 Jul 2013 00:37:26 +0100
changeset 1288 2e9c41125820
parent 1277 3fbd928acf60 (diff)
parent 1287 4b788bb2993d (current diff)
child 1291 451cbdc0b353
Merge with stable