Merge remote branch 'origin/master'
authorWeblate <42@minetest.ru>
Thu, 24 Jan 2013 14:56:49 +0000 (15:56 +0100)
committerWeblate <42@minetest.ru>
Thu, 24 Jan 2013 14:56:49 +0000 (15:56 +0100)

Trivial merge