Merge branch 'master' into martin-t/okc

author Martin Taibr <taibr.martin@gmail.com>

Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)

committer Martin Taibr <taibr.martin@gmail.com>

Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)
author Martin Taibr <taibr.martin@gmail.com>
Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)
committer Martin Taibr <taibr.martin@gmail.com>
Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Mon, 7 Aug 2017 18:37:04 +0000 (20:37 +0200)