Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 02 Oct 2013 01:22:11 +0100
changeset 1296 115d2b6a8a9c
parent 1294 5a04f94e1da9 (diff)
parent 1295 8e66ac9c0f0e (current diff)
child 1299 ce8024f27837
Merge with stable