From: terencehill <piuntn@gmail.com>
Date: Thu, 1 Sep 2016 09:08:47 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/CA_forbidspawn
X-Git-Tag: xonotic-v0.8.2~620^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27b2c8902c6a8c8fe481c7bea54926d88f1de434;p=xonotic%2Fxonotic-data.pk3dir.git

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

27b2c8902c6a8c8fe481c7bea54926d88f1de434