From: Samual Lenks <samual@xonotic.org>
Date: Fri, 31 May 2013 15:57:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/debugger/dance'
X-Git-Tag: xonotic-v0.7.0~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38139c64e4b8f016f0811b53329b4168c44743ad;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/debugger/dance'
---

38139c64e4b8f016f0811b53329b4168c44743ad