From: Mario <mario@smbclan.net>
Date: Mon, 27 Feb 2017 12:21:10 +0000 (+1000)
Subject: Merge branch 'master' into tzork/map-dotc_test4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc7a49d13a554f84e346d14ae37c1def2976069d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into tzork/map-dotc_test4
---

fc7a49d13a554f84e346d14ae37c1def2976069d