From: terencehill <piuntn@gmail.com>
Date: Sat, 6 May 2017 23:02:48 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~165
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aaa298baa3cffa029d5f1c03a834549861fe31b1;p=xonotic%2Fxonotic-data.pk3dir.git

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

aaa298baa3cffa029d5f1c03a834549861fe31b1