Merge branch 'martin-t/defaults' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 11 Jun 2018 08:55:19 +0000 (08:55 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 11 Jun 2018 08:55:19 +0000 (08:55 +0000)
Changes to defaults

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


Trivial merge