Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 02 Mar 2014 13:53:07 +0000
changeset 1349 42b428c5fcd8
parent 1345 ea8abd9436ee (diff)
parent 1348 2cb27f4b641c (current diff)
child 1352 9dcd045229b4
Merge with stable