Merge branch 'martin-t/example-config' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 7 Mar 2018 08:26:35 +0000 (08:26 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 7 Mar 2018 08:26:35 +0000 (08:26 +0000)
Example config changes

See merge request xonotic/xonotic!35


Trivial merge