From: terencehill <piuntn@gmail.com>
Date: Tue, 17 Jul 2018 15:19:59 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~1923^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=70bba988cd32922d29e40235db6ad1d8149bdc67;p=xonotic%2Fxonotic-data.pk3dir.git

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

70bba988cd32922d29e40235db6ad1d8149bdc67