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

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

Mention overkill in server.cfg

See merge request !24
---

e2f896a5a4e2fcfe07623a7dfdf634e2514fcd65