Merge remote-tracking branch 'origin/fruitiex/runningmanfix'

author Samual Lenks <samual@xonotic.org>

Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)

committer Samual Lenks <samual@xonotic.org>

Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
author Samual Lenks <samual@xonotic.org>
Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
committer Samual Lenks <samual@xonotic.org>
Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
diff --cc maps/runningman.map
Simple merge
diff --cc maps/runningmanctf.map
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)
		1	2
maps/runningman.map	patch \|	diff1 \|	diff2 \|	blob \| history
maps/runningmanctf.map	patch \|	diff1 \|	diff2 \|	blob \| history