From: Mirio <opivy@hotmail.de>
Date: Sun, 19 Mar 2017 18:30:02 +0000 (+0000)
Subject: Merge branch 'packer/dance-caulked' into 'master'
X-Git-Tag: xonotic-v0.8.2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=697c4f807af740bfbfdbac2e757548394a91488f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'packer/dance-caulked' into 'master'

packer/dance-caulked

See merge request !93
---

697c4f807af740bfbfdbac2e757548394a91488f