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

Merge branch 'upstream/master'
---

3c630c0d90a8d997475c07bc52781126e5f531e6