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

Merge branch 'packer/warpzones' into 'master'

Packer/warpzones

See merge request !75
---

2de5b6df8fb4e30662e76bc647f1a5d562d6cb9a