From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:35:10 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Sprint
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2FSprint;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/Sprint
---

357caf72e4ee50f7a043ba65e6ff4a2a8ee9d298