From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Wed, 20 Jul 2011 12:20:07 +0000 (+0200)
Subject: Merge branch 'upstream/master'
X-Git-Tag: 0.2.20110731_3~50^2~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9bc701d194ea9e2bc56c1c9c473d6602e6070d60;p=oweals%2Fminetest.git

Merge branch 'upstream/master'
---

9bc701d194ea9e2bc56c1c9c473d6602e6070d60