From: terencehill <piuntn@gmail.com>
Date: Fri, 11 Nov 2016 18:14:55 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/ca_bots_fix
X-Git-Tag: xonotic-v0.8.2~388^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df6524e32dea9e91c2c4ba6ff383eef5d20ffcdb;p=xonotic%2Fxonotic-data.pk3dir.git

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

df6524e32dea9e91c2c4ba6ff383eef5d20ffcdb