From: Mirio Date: Wed, 26 Oct 2016 22:35:07 +0000 (+0200) Subject: Merge branch 'master' into packer/vorix X-Git-Tag: xonotic-v0.8.2~131^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F53%2Fhead;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into packer/vorix --- 2848e3a98f3af541a39e7653078b330a3ba9c3e4