From: Nils Dagsson Moskopp Date: Fri, 22 Jul 2011 18:16:58 +0000 (+0200) Subject: Merge branch 'upstream/master' X-Git-Tag: 0.2.20110922~81^2~35^2~2^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0;p=oweals%2Fminetest.git Merge branch 'upstream/master' --- 7985d746f97ce1b37b6ca48a8a3e7ed70d02e4b0