Merge branch 'TimePath/spawnfuncs' into 'master'

author TimePath <andrew.hardaker1995@gmail.com>

Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)

committer TimePath <andrew.hardaker1995@gmail.com>

Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)
author TimePath <andrew.hardaker1995@gmail.com>
Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)
committer TimePath <andrew.hardaker1995@gmail.com>
Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
author	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)