From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Wed, 20 Jul 2011 16:29:48 +0000 (+0200)
Subject: Merge branch 'master' of github.com:erlehmann/minetest-delta
X-Git-Tag: 0.2.20110922~81^2~35^2~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33e80dae7f48eac99d5c692d7429e37b11666c96;p=oweals%2Fminetest.git

Merge branch 'master' of github.com:erlehmann/minetest-delta
---

33e80dae7f48eac99d5c692d7429e37b11666c96