From: terencehill <piuntn@gmail.com>
Date: Sun, 29 Apr 2018 11:19:30 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~1923^2~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=164d3e92e91b91d8f6960ee6442f4906dffb418d;p=xonotic%2Fxonotic-data.pk3dir.git

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

164d3e92e91b91d8f6960ee6442f4906dffb418d