Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

author Lyberta <lyberta@lyberta.net>

Sat, 5 Aug 2017 02:45:28 +0000 (05:45 +0300)

committer Lyberta <lyberta@lyberta.net>

Sat, 5 Aug 2017 02:45:28 +0000 (05:45 +0300)
author Lyberta <lyberta@lyberta.net>
Sat, 5 Aug 2017 02:45:28 +0000 (05:45 +0300)
committer Lyberta <lyberta@lyberta.net>
Sat, 5 Aug 2017 02:45:28 +0000 (05:45 +0300)
diff --cc qcsrc/common/mutators/mutator/overkill/rpc.qh
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Sat, 5 Aug 2017 02:45:28 +0000 (05:45 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sat, 5 Aug 2017 02:45:28 +0000 (05:45 +0300)