Merge remote-tracking branch 'origin/DefaultUser/ca_spectator_fix'

author Mario <mario@smbclan.net>

Sun, 3 Jul 2016 23:13:54 +0000 (09:13 +1000)

committer Mario <mario@smbclan.net>

Sun, 3 Jul 2016 23:13:54 +0000 (09:13 +1000)
author Mario <mario@smbclan.net>
Sun, 3 Jul 2016 23:13:54 +0000 (09:13 +1000)
committer Mario <mario@smbclan.net>
Sun, 3 Jul 2016 23:13:54 +0000 (09:13 +1000)
diff --cc qcsrc/server/mutators/mutator/gamemode_ca.qc
Simple merge
author	Mario <mario@smbclan.net>
	Sun, 3 Jul 2016 23:13:54 +0000 (09:13 +1000)
committer	Mario <mario@smbclan.net>
	Sun, 3 Jul 2016 23:13:54 +0000 (09:13 +1000)