From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Mon, 27 Jun 2011 13:56:26 +0000 (-0700)
Subject: Merge pull request #13 from Bahamada/upstream_merge
X-Git-Tag: 0.2.20110731_3~50^2~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c90f9fc2eba43be71f9d49dad75c5d0514d4e50;p=oweals%2Fminetest.git

Merge pull request #13 from Bahamada/upstream_merge

Upstream merge
---

1c90f9fc2eba43be71f9d49dad75c5d0514d4e50