Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 13 Mar 2014 11:19:32 +0000
changeset 1356 d9c3f8002e7c
parent 1352 9dcd045229b4 (diff)
parent 1355 238b6ca6d2bb (current diff)
child 1360 e7fa36b2bd23
Merge with stable