From: terencehill <piuntn@gmail.com>
Date: Sat, 29 Jul 2017 15:04:07 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~108
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=175b123de833e7964cd69cf8110e4e785c65bd88

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

175b123de833e7964cd69cf8110e4e785c65bd88