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

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

2abe6ed75c22a0cb3154043446100baab01624fd