From: terencehill <piuntn@gmail.com>
Date: Mon, 4 Jun 2018 18:12:40 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~1923^2~42
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6f68685178c1050cafeb711a2ffc05656d1fb3ea

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

6f68685178c1050cafeb711a2ffc05656d1fb3ea