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.20110922~81^2~35^2~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f37a3a84fafb91bcfc109fed95aa6d42726f1bf7;hp=13cf5425db613dc0a4323c87a4988bb18fb87aca;p=oweals%2Fminetest.git

Merge pull request #13 from Bahamada/upstream_merge

Upstream merge
---