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

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

17e8ecff487505e7384d198e9f9da11d7b7addc2