From: Maddin <mjschwan@gmx.de>
Date: Sat, 8 Oct 2016 13:22:52 +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=6953996f3e421d2dba618f55477ecb2a7c59945c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into maddin/map-airwalk
---

6953996f3e421d2dba618f55477ecb2a7c59945c