From: Mirio <opivy@hotmail.de>
Date: Fri, 28 Aug 2015 14:51:59 +0000 (+0200)
Subject: Merge branch 'matthiaskrgr/dance_unstuck'
X-Git-Tag: xonotic-v0.8.2~185
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9591a4d569bb22e16b4df25e4352cc2295c5ebb;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/dance_unstuck'
---

b9591a4d569bb22e16b4df25e4352cc2295c5ebb