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

Trivial merge