From: Mario <mario@smbclan.net>
Date: Sun, 11 Feb 2018 00:33:52 +0000 (+1000)
Subject: Merge branch 'master' into DefaultUser/waypoint_icons
X-Git-Tag: xonotic-v0.8.5~2328^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F528%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/waypoint_icons
---

aa4507ba10fd2f6598f045dea834df84087c3069