From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 22:21:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/individual_switchdelay'
X-Git-Tag: xonotic-v0.7.0~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de2e4697b994b986882536b595cbbacfe4390903;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/individual_switchdelay'
---

de2e4697b994b986882536b595cbbacfe4390903