From: Nils Dagsson Moskopp Date: Sat, 16 Jul 2011 14:52:45 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/upstream' X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=014a3aea3257aadf53e50bcedd4d2da148bafea2;p=zefram%2Fminetest%2Fminetest_engine.git Merge remote-tracking branch 'origin/upstream' --- 014a3aea3257aadf53e50bcedd4d2da148bafea2