From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 23 Feb 2018 22:26:32 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/example-config
X-Git-Tag: xonotic-v0.8.5~180^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a0ff870ff6b234747a81dd669d18d463e802cb9;p=xonotic%2Fxonotic.git

Merge branch 'master' into martin-t/example-config
---

1a0ff870ff6b234747a81dd669d18d463e802cb9