From: terencehill <piuntn@gmail.com>
Date: Fri, 18 May 2018 10:54:28 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~1923^2~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93d199789e02f894ce801e815810d706d909a93d;p=xonotic%2Fxonotic-data.pk3dir.git

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

93d199789e02f894ce801e815810d706d909a93d