From: Mario <mario@smbclan.net>
Date: Wed, 24 May 2017 03:16:53 +0000 (+1000)
Subject: Merge master again...
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Finfection_merge;p=xonotic%2Fxonotic-data.pk3dir.git

Merge master again...
---

c6a89f0f3bc6aad9ff78c736fc6718ce4e802ea7