From: Mario <zacjardine@y7mail.com>
Date: Mon, 11 Jun 2018 08:55:19 +0000 (+0000)
Subject: Merge branch 'martin-t/defaults' into 'master'
X-Git-Tag: xonotic-v0.8.5~2073
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2e3660c5c919d8be9594934e8f6eec9b82346a3;p=xonotic%2Fxonotic-data.pk3dir.git

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

Changes to defaults

See merge request xonotic/xonotic-data.pk3dir!530
---

b2e3660c5c919d8be9594934e8f6eec9b82346a3