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

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

6e012d896a50c037c467a399e7122eea501c53a4