Merge remote branch 'origin/master'
authorWeblate <42@minetest.ru>
Wed, 3 Apr 2013 18:32:13 +0000 (20:32 +0200)
committerWeblate <42@minetest.ru>
Wed, 3 Apr 2013 18:32:13 +0000 (20:32 +0200)

Trivial merge