From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 Nov 2011 05:44:06 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~85
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=daf681e355c827dbe724cb7c5b1daed7c1061456;p=xonotic%2Fxonotic-data.pk3dir.git

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

daf681e355c827dbe724cb7c5b1daed7c1061456