From: terencehill <piuntn@gmail.com>
Date: Mon, 17 Jul 2017 22:23:08 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~2378^2~127
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cabba6eeb71f3ca612aa30bb8c7dad9cbc9c0d52

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

cabba6eeb71f3ca612aa30bb8c7dad9cbc9c0d52