From: Mario <zacjardine@y7mail.com>
Date: Wed, 15 Mar 2017 21:02:22 +0000 (+0000)
Subject: Merge branch 'martin-t/overkill' into 'master'
X-Git-Tag: xonotic-v0.8.2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3a09b33a838077c30c565cf68739ab49790a30e;p=xonotic%2Fxonotic-data.pk3dir.git

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

Default overkill config

See merge request !424
---

f3a09b33a838077c30c565cf68739ab49790a30e