Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

author terencehill <piuntn@gmail.com>

Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)

committer terencehill <piuntn@gmail.com>

Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
author terencehill <piuntn@gmail.com>
Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
committer terencehill <piuntn@gmail.com>
Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
diff --cc qcsrc/server/g_world.qc
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
committer	terencehill <piuntn@gmail.com>
	Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
		1	2
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history