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-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=f37a3a84fafb91bcfc109fed95aa6d42726f1bf7;p=zefram%2Fminetest%2Fminetest_engine.git

Merge pull request #13 from Bahamada/upstream_merge

Upstream merge
---

f37a3a84fafb91bcfc109fed95aa6d42726f1bf7