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

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

7dfa3442fe658d51cc140f1a44dab768bb1e76a9