From: Mario <zacjardine@y7mail.com>
Date: Fri, 13 Mar 2015 08:27:59 +0000 (+1100)
Subject: Merge branch 'matthiaskrgr/dance'
X-Git-Tag: xonotic-v0.8.1~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2397776b501c5d6bd943f5d4755b2a72c5fb0112;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/dance'
---

2397776b501c5d6bd943f5d4755b2a72c5fb0112