From: Mario <mario@smbclan.net>
Date: Tue, 19 Jun 2018 01:34:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: xonotic-v0.8.5~2010
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=879dac5094b8eb7890fb5fd970f822da31ee242f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master'
---

879dac5094b8eb7890fb5fd970f822da31ee242f