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

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

a415f293cb98d381b3cf456fa17624d8a47827b5