From: Spike29 <leguen.yannick@gmail.com>
Date: Tue, 18 Sep 2018 20:41:02 +0000 (+0200)
Subject: Merge branch 'master' into Spike29/tutorial_level1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=745b59f20e97cda288c4d848a1bab99494f62542;p=xonotic%2Fxonotic-maps.pk3dir.git

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

745b59f20e97cda288c4d848a1bab99494f62542