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.20110731_3~50^2~64^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4ddf2bc8a2531e158d63e92325319f21bea9278d;p=oweals%2Fminetest.git

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

4ddf2bc8a2531e158d63e92325319f21bea9278d