From: Mario <mario@smbclan.net>
Date: Mon, 11 Jun 2018 08:06:38 +0000 (+1000)
Subject: Merge branch 'master' into martin-t/defaults
X-Git-Tag: xonotic-v0.8.5~2073^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e51ce3d45d2852ca793118fc73da9c25f789101f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/defaults
---

e51ce3d45d2852ca793118fc73da9c25f789101f