Merge branch 'master' into martin-t/okc

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

Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)

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

Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)
author Martin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)
committer Martin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)