Merge remote-tracking branch 'origin/master'
authorWeblate <42@minetest.ru>
Fri, 21 Jun 2013 08:24:16 +0000 (10:24 +0200)
committerWeblate <42@minetest.ru>
Fri, 21 Jun 2013 08:24:16 +0000 (10:24 +0200)

Trivial merge