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

Trivial merge