From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:27:13 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/lightspeed'
X-Git-Tag: xonotic-v0.7.0~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8cb16a3ff63326e001d60dafb6756315b6e88332;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/lightspeed'
---

8cb16a3ff63326e001d60dafb6756315b6e88332