From: teddydestodes <derkomtur@schattengang.net>
Date: Wed, 1 Jun 2011 17:47:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=de36e284ae9df9528c393018ecea19172e57f385;p=zefram%2Fminetest%2Fminetest_engine.git

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

de36e284ae9df9528c393018ecea19172e57f385