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

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

9f4048f5cf489b5d5fe92db9e336963c93abbdce