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

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

0a51a35ab4cfaff9b2e349331b68f074f6152f8b