Merge branch 'master' into mario/monsters

author Mario <mario.mario@y7mail.com>

Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)

committer Mario <mario.mario@y7mail.com>

Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
author Mario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
committer Mario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
committer	Mario <mario.mario@y7mail.com>
	Mon, 25 Feb 2013 19:21:59 +0000 (06:21 +1100)
		1	2
qcsrc/server/cl_client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history