Merge branch 'master' into Mario/entrap_nade

author Mario <mario@smbclan.net>

Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)

committer Mario <mario@smbclan.net>

Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)
author Mario <mario@smbclan.net>
Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)
committer Mario <mario@smbclan.net>
Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
author	Mario <mario@smbclan.net>
	Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)
committer	Mario <mario@smbclan.net>
	Tue, 14 Jun 2016 12:58:50 +0000 (22:58 +1000)