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

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

583ff2fd202086e9cccd53071a5b88371b8d9dd1