From: terencehill <piuntn@gmail.com>
Date: Wed, 6 Sep 2017 16:36:50 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~73
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=678127044857fb9b89f06faf7a3313bdeb43205c;p=xonotic%2Fxonotic-data.pk3dir.git

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

678127044857fb9b89f06faf7a3313bdeb43205c