Merge remote-tracking branch 'origin/Mirio/runningmanctf'
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:12:58 +0000 (12:12 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:12:58 +0000 (12:12 -0400)

Trivial merge