From: Weblate <42@minetest.ru>
Date: Sat, 1 Jun 2013 11:18:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 0.4.7~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124;p=oweals%2Fminetest.git

Merge remote-tracking branch 'origin/master'
---

1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124