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

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

3382a71b15c2f2101e45d71b0da083568998dd18