From: Mirio <opivy@hotmail.de>
Date: Wed, 19 Aug 2015 00:05:37 +0000 (+0200)
Subject: Merge branch 'packer/map-fixes'
X-Git-Tag: xonotic-v0.8.1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa575802da2efbf35e34d95abbed128647761fed;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'packer/map-fixes'
---

d52e81c2caef88f7bf1db069562e34be7c7833b8