From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 9 Dec 2011 21:15:01 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=177108e231103716364491bcf2eb8f295931fe7d;p=xonotic%2Fxonotic-data.pk3dir.git

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

177108e231103716364491bcf2eb8f295931fe7d