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

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

fbfa773420d614732d6197caa5dd228b41848bbc