From: Spike29 <leguen.yannick@gmail.com>
Date: Fri, 21 Sep 2018 17:29:07 +0000 (+0200)
Subject: Merge branch 'master' into Spike29/tutorial_level1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2af77cf7ef98a7a4fc9da4f7128400a2ecad9640;p=xonotic%2Fxonotic-maps.pk3dir.git

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

2af77cf7ef98a7a4fc9da4f7128400a2ecad9640