From: terencehill <piuntn@gmail.com>
Date: Tue, 17 Oct 2017 00:05:53 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~40^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d32c10f81438b5a095ddf1bbdaaed13408e841f;p=xonotic%2Fxonotic-data.pk3dir.git

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

8d32c10f81438b5a095ddf1bbdaaed13408e841f