From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Fri, 22 Jul 2011 18:16:58 +0000 (+0200)
Subject: Merge branch 'upstream/master'
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0;p=zefram%2Fminetest%2Fminetest_engine.git

Merge branch 'upstream/master'
---

7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0