From: Mario <mario@smbclan.net>
Date: Sat, 11 Mar 2017 22:13:45 +0000 (+1000)
Subject: Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir
X-Git-Tag: xonotic-v0.8.2~74
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=96ceaec0bf2c1d924d967450e83a0561e19e12e1;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir
---

96ceaec0bf2c1d924d967450e83a0561e19e12e1