Merge remote-tracking branch 'origin/master'
authorWeblate <42@minetest.ru>
Mon, 13 May 2013 16:19:51 +0000 (18:19 +0200)
committerWeblate <42@minetest.ru>
Mon, 13 May 2013 16:19:51 +0000 (18:19 +0200)

Trivial merge