From: terencehill <piuntn@gmail.com>
Date: Mon, 11 Sep 2017 15:09:11 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~60^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5c01c086b09002135f17404f9b542823feede29e;p=xonotic%2Fxonotic-data.pk3dir.git

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

5c01c086b09002135f17404f9b542823feede29e