From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Sat, 16 Jul 2011 14:52:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/upstream'
X-Git-Tag: 0.2.20110731_3~50^2~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=014a3aea3257aadf53e50bcedd4d2da148bafea2;p=oweals%2Fminetest.git

Merge remote-tracking branch 'origin/upstream'
---

014a3aea3257aadf53e50bcedd4d2da148bafea2