From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Sat, 30 Jul 2011 17:46:55 +0000 (+0200)
Subject: Merge branch 'upstream/master'
X-Git-Tag: 0.2.20110922~81^2~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=96bee29e35f0790657fbd8bb67d2af79b498255c;p=oweals%2Fminetest.git

Merge branch 'upstream/master'
---

96bee29e35f0790657fbd8bb67d2af79b498255c