Merge remote branch 'origin/master'
authorWeblate <42@minetest.ru>
Thu, 18 Apr 2013 18:00:16 +0000 (20:00 +0200)
committerWeblate <42@minetest.ru>
Thu, 18 Apr 2013 18:00:16 +0000 (20:00 +0200)

Trivial merge