From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 2 Dec 2011 08:36:03 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~32
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=23cf4ce685dd5317d84b2db53aecd97e93c8a2de;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/csqcmodel
---

23cf4ce685dd5317d84b2db53aecd97e93c8a2de