Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 08 Jun 2013 13:46:05 +0100
changeset 1271 181e420ff0ac
parent 1264 b42c9f1d461a (diff)
parent 1270 79e0df6ffaad (current diff)
child 1275 b4ecdf12956f
Merge with stable