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

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

dbd70b94590d2aeb8fec00675497b9700563b628