From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Apr 2016 12:22:12 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/modified_default_cvars
X-Git-Tag: xonotic-v0.8.2~970^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F299%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/modified_default_cvars
---

3b934631926acf4b06d969dcd361a26a3073d2c8