From: terencehill <piuntn@gmail.com>
Date: Wed, 31 Aug 2016 12:15:20 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/CA_forbidspawn
X-Git-Tag: xonotic-v0.8.2~620^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a491650510dce3f774cce457ebf15ddcafcf393f;p=xonotic%2Fxonotic-data.pk3dir.git

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

a491650510dce3f774cce457ebf15ddcafcf393f