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.20110922~81^2~35^2~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ed83250d7253324426b3b5528da17948c935136;p=oweals%2Fminetest.git

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

8ed83250d7253324426b3b5528da17948c935136