Merge remote-tracking branch 'origin/master'
authorWeblate <42@minetest.ru>
Wed, 1 May 2013 13:33:15 +0000 (15:33 +0200)
committerWeblate <42@minetest.ru>
Wed, 1 May 2013 13:33:15 +0000 (15:33 +0200)

Trivial merge