Merge remote-tracking branch 'origin/Mirio/runningman'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:23:24 +0000 (13:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:23:24 +0000 (13:23 -0400)

Trivial merge