Merge branch 'master' into terencehill/gameover_stuff

author terencehill <piuntn@gmail.com>

Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)
author terencehill <piuntn@gmail.com>
Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)
diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)