Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 20 Mar 2014 01:02:04 +0000
changeset 1360 e7fa36b2bd23
parent 1356 d9c3f8002e7c (diff)
parent 1359 e23422941bae (current diff)
child 1362 a5dabff2e764
Merge with stable