From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 23 Jul 2011 12:46:00 +0000 (+0300)
Subject: merged some stuff from upstream while merging delta
X-Git-Tag: 0.2.20110731_3~55^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3882536d40656564b31c20008b55dfd77e848304;p=oweals%2Fminetest.git

merged some stuff from upstream while merging delta
---

3882536d40656564b31c20008b55dfd77e848304