From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 26 Sep 2019 13:35:31 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/example-config
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4bef11dd105bae0ed398c9bc88c2dcb6d895d3d4;p=xonotic%2Fxonotic.git

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

4bef11dd105bae0ed398c9bc88c2dcb6d895d3d4