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=2abe6ed75c22a0cb3154043446100baab01624fd;p=zefram%2Fminetest%2Fminetest_engine.git

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

2abe6ed75c22a0cb3154043446100baab01624fd