From: Mario <mario.mario@y7mail.com>
Date: Mon, 21 Oct 2013 08:38:12 +0000 (+1100)
Subject: Merge branch 'master' into Mario/csqc_models
X-Git-Tag: xonotic-v0.8.0~257^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fcf7fbf067d9cd2e8d5094c34e56a087af6d97d5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/csqc_models
---

fcf7fbf067d9cd2e8d5094c34e56a087af6d97d5