From: terencehill <piuntn@gmail.com>
Date: Fri, 1 Dec 2017 14:39:56 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~14^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e113dae328809b5e7432f434649a35ebb185a52;p=xonotic%2Fxonotic-data.pk3dir.git

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

9e113dae328809b5e7432f434649a35ebb185a52