Merge branch 'master' into martin-t/msnt

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

Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)

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

Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)
author Martin Taibr <taibr.martin@gmail.com>
Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)
committer Martin Taibr <taibr.martin@gmail.com>
Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)
diff --cc qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)