From: terencehill <piuntn@gmail.com>
Date: Mon, 5 Jun 2017 12:54:08 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~144
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c879eb771ea22f97a56cc1c1aaf5487c40cf9e3d;p=xonotic%2Fxonotic-data.pk3dir.git

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

c879eb771ea22f97a56cc1c1aaf5487c40cf9e3d