From: Constantin Wenger <constantin.wenger@googlemail.com>
Date: Fri, 22 Jul 2011 18:53:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=383698186f954f52b8a957ef741175c437bf2502;p=zefram%2Fminetest%2Fminetest_engine.git

Merge remote-tracking branch 'upstream/master'
---

383698186f954f52b8a957ef741175c437bf2502