From: Lyberta <lyberta@lyberta.net>
Date: Fri, 8 Jun 2018 15:02:58 +0000 (+0300)
Subject: Merge branch 'Lyberta/Sprint' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=647000b9ed663c53feb844339da4476e57e14950;p=xonotic%2Fxonotic-data.pk3dir.git

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

647000b9ed663c53feb844339da4476e57e14950