From: terencehill <piuntn@gmail.com>
Date: Wed, 3 Jan 2018 15:25:39 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~3^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf853505a82f19839d47bcefe27900dbb52e0134;p=xonotic%2Fxonotic-data.pk3dir.git

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

bf853505a82f19839d47bcefe27900dbb52e0134