From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Wed, 20 Jul 2011 12:20:07 +0000 (+0200)
Subject: Merge branch 'upstream/master'
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=9bc701d194ea9e2bc56c1c9c473d6602e6070d60;p=zefram%2Fminetest%2Fminetest_engine.git

Merge branch 'upstream/master'
---

9bc701d194ea9e2bc56c1c9c473d6602e6070d60