Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 22 Mar 2014 08:44:07 +0000
changeset 1362 a5dabff2e764
parent 1360 e7fa36b2bd23 (diff)
parent 1361 1d3aa8779efb (current diff)
child 1367 b3bee8727631
Merge with stable