From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 10 May 2010 07:31:38 +0000 (+0200)
Subject: Merge branch 'master' into diabolik/umbraplayermodel
X-Git-Tag: xonotic-v0.1.0preview~635
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=140a4f6ce49232daabbb3b1f0310ffffac93b104;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into diabolik/umbraplayermodel
---

140a4f6ce49232daabbb3b1f0310ffffac93b104