From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 4 Dec 2011 16:00:08 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d53800a81ad1253e6ee6eca8b9971bbf275df7ee;p=xonotic%2Fxonotic-data.pk3dir.git

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

d53800a81ad1253e6ee6eca8b9971bbf275df7ee