From: Spike29 <leguen.yannick@gmail.com>
Date: Wed, 17 Oct 2018 19:39:47 +0000 (+0200)
Subject: Merge branch 'master' into Spike29/tutorial_level2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e4b5b1225531d1d6582e99a46bbdb394e9d38c8;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Spike29/tutorial_level2
---

4e4b5b1225531d1d6582e99a46bbdb394e9d38c8