From: Maddin <mjschwan@gmx.de>
Date: Thu, 28 Jul 2016 18:31:14 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=008b094ad1d1a9c93047bc7925b52429979babf4;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into maddin/map-airwalk
... is it correct to merge upstream? :/ Let's try it!
---

008b094ad1d1a9c93047bc7925b52429979babf4