Merge remote-tracking branch 'origin/fruitiex/runningmanfix'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
1  2 
maps/runningman.map
maps/runningmanctf.map

Simple merge
Simple merge