From: Mario <zacjardine@y7mail.com>
Date: Wed, 9 Aug 2017 13:10:10 +0000 (+0000)
Subject: Merge branch 'Mario/cs_clientcvars' into 'master'
X-Git-Tag: xonotic-v0.8.5~2532
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ea21cf9661f922f64dd6cc698f3aa717bb70c3ab

Merge branch 'Mario/cs_clientcvars' into 'master'

Merge branch Mario/cs_clientcvars (M merge request)

See merge request !458
---

ea21cf9661f922f64dd6cc698f3aa717bb70c3ab