Merge branch 'master' into terencehill/ons_camera

author terencehill <piuntn@gmail.com>

Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)
author terencehill <piuntn@gmail.com>
Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)
diff --cc qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)