Merge branch 'master' into terencehill/ons_camera

author terencehill <piuntn@gmail.com>

Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)

committer terencehill <piuntn@gmail.com>

Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)
author terencehill <piuntn@gmail.com>
Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)
committer terencehill <piuntn@gmail.com>
Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)
diff --cc qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)
committer	terencehill <piuntn@gmail.com>
	Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)