From: terencehill <piuntn@gmail.com>
Date: Tue, 18 Apr 2017 23:11:39 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~178
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=35eff34d3dd4296ca9a9ab553f6d71e76dd9581f

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

35eff34d3dd4296ca9a9ab553f6d71e76dd9581f