From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Fri, 22 Jul 2011 18:16:58 +0000 (+0200)
Subject: Merge branch 'upstream/master'
X-Git-Tag: 0.2.20110731_3~50^2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=805ccd449fdd62e05083b71c1e035e5e7347c73a;p=oweals%2Fminetest.git

Merge branch 'upstream/master'
---

805ccd449fdd62e05083b71c1e035e5e7347c73a