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

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

2732dac337229297cc15941f2ca625a33fbcfef4