From: Mario <mario@smbclan.net>
Date: Sun, 12 Mar 2017 03:21:26 +0000 (+1000)
Subject: Merge branch 'master' into Mario/race_target_waypoint
X-Git-Tag: xonotic-v0.8.2~70^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5fb2f3c4e123910e6291d6337fadd61f5199f5a5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/race_target_waypoint
---

5fb2f3c4e123910e6291d6337fadd61f5199f5a5