From: Mirio <opivy@hotmail.de>
Date: Fri, 3 Mar 2017 23:06:02 +0000 (+0000)
Subject: Merge branch 'Mirio/dance' into 'master'
X-Git-Tag: xonotic-v0.8.2~95
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=598f437cb066942b91f3c6e4a82fbac80d6e3258;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/dance' into 'master'

Break the glass, #121

See merge request !56
---

598f437cb066942b91f3c6e4a82fbac80d6e3258