Merge branch 'master' into terencehill/race_fix

author terencehill <piuntn@gmail.com>

Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)

committer terencehill <piuntn@gmail.com>

Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
author terencehill <piuntn@gmail.com>
Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
committer terencehill <piuntn@gmail.com>
Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
diff --cc qcsrc/server/g_world.qc
Simple merge
diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge
diff --cc qcsrc/server/mutators/mutator/gamemode_race.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
committer	terencehill <piuntn@gmail.com>
	Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
		1	2
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_assault.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_race.qc	patch \|	diff1 \|	diff2 \|	blob \| history