From: Maddin <mjschwan@gmx.de>
Date: Sun, 7 May 2017 10:00:11 +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=137ec50f77415d730d102b947f4e89dd602e8e03;p=xonotic%2Fxonotic-maps.pk3dir.git

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

137ec50f77415d730d102b947f4e89dd602e8e03