From: terencehill <piuntn@gmail.com>
Date: Tue, 10 Apr 2018 10:17:42 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2174^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3cfa3eaf6856fe76f7fd8c945fbfab2e9e28014c;p=xonotic%2Fxonotic-data.pk3dir.git

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

3cfa3eaf6856fe76f7fd8c945fbfab2e9e28014c