Merge branch 'master' into terencehill/arena_and_ca_fixes

author terencehill <piuntn@gmail.com>

Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)

committer terencehill <piuntn@gmail.com>

Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
author terencehill <piuntn@gmail.com>
Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
committer terencehill <piuntn@gmail.com>
Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/cl_player.qc
Simple merge
diff --cc qcsrc/server/command/cmd.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
committer	terencehill <piuntn@gmail.com>
	Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
		1	2
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	patch \|	diff1 \|	diff2 \|	blob \| history