From: terencehill <piuntn@gmail.com>
Date: Sat, 30 Dec 2017 17:54:49 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~3^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d8a70399fec0a44f3671096b261c3fc9f53f2ad;p=xonotic%2Fxonotic-data.pk3dir.git

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

2d8a70399fec0a44f3671096b261c3fc9f53f2ad