From: Rudolf Polzer Date: Wed, 12 May 2010 19:42:18 +0000 (+0200) Subject: Merge remote branch 'origin/master' into diabolik/umbraplayermodel X-Git-Tag: xonotic-v0.1.0preview~632 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f0fc2e78f1dbcf998fb3419f33381a11d1eaf52b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into diabolik/umbraplayermodel --- f0fc2e78f1dbcf998fb3419f33381a11d1eaf52b