From: Mario <zacjardine@y7mail.com>
Date: Fri, 6 Jan 2017 00:29:36 +0000 (+0000)
Subject: Merge branch 'martin-t/server.cfg' into 'master'
X-Git-Tag: xonotic-v0.8.2~10
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=14a780806603fee672fd6b4845ec0e934b0c0f1d

Merge branch 'martin-t/server.cfg' into 'master'

Mention apropos and cacs in server.cfg

See merge request !20
---

14a780806603fee672fd6b4845ec0e934b0c0f1d