From: teddydestodes <derkomtur@schattengang.net>
Date: Wed, 1 Jun 2011 12:11:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.2.20110922~81^2~35^2~63^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63fe487d933f00123bb97d699c98e0c5248a8060;p=oweals%2Fminetest.git

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

63fe487d933f00123bb97d699c98e0c5248a8060