Merge remote-tracking branch 'origin/samual/individual_switchdelay'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)

Trivial merge