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

Merge branch 'packer/dance' into 'master'

packer/dance

See merge request !94
---

23545de323a1e6ab93c7890f7a5286286abf24d4