From: Mirio <opivy@hotmail.de>
Date: Sun, 12 Mar 2017 21:57:20 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
X-Git-Tag: xonotic-v0.8.2~63
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9f0618204a8a73a16fb938ffacc6ae835a8b543;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
---

e9f0618204a8a73a16fb938ffacc6ae835a8b543