From: terencehill <piuntn@gmail.com>
Date: Sun, 13 Aug 2017 15:43:51 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~87
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fb5876e8defeb6af31e62002be26bdfa2beb56a7;p=xonotic%2Fxonotic-data.pk3dir.git

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

fb5876e8defeb6af31e62002be26bdfa2beb56a7