Merge remote-tracking branch 'origin/Mirio/runningmanctf'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:04:57 +0000 (17:04 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:04:57 +0000 (17:04 -0400)

Trivial merge