Merge remote-tracking branch 'origin/master'
authorWeblate <42@minetest.ru>
Sat, 1 Jun 2013 11:18:52 +0000 (13:18 +0200)
committerWeblate <42@minetest.ru>
Sat, 1 Jun 2013 11:18:52 +0000 (13:18 +0200)

Trivial merge