Merge branch 'master' into terencehill/arena_and_ca_fixes

author terencehill <piuntn@gmail.com>

Thu, 5 Jan 2012 20:15:34 +0000 (21:15 +0100)

committer terencehill <piuntn@gmail.com>

Thu, 5 Jan 2012 22:38:07 +0000 (23:38 +0100)
author terencehill <piuntn@gmail.com>
Thu, 5 Jan 2012 20:15:34 +0000 (21:15 +0100)
committer terencehill <piuntn@gmail.com>
Thu, 5 Jan 2012 22:38:07 +0000 (23:38 +0100)
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/sv_main.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Thu, 5 Jan 2012 20:15:34 +0000 (21:15 +0100)
committer	terencehill <piuntn@gmail.com>
	Thu, 5 Jan 2012 22:38:07 +0000 (23:38 +0100)
		1	2
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	patch \|	diff1 \|	diff2 \|	blob \| history