Merge branch 'master' into Mario/intrusive

author Mario <mario@smbclan.net>

Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)

committer Mario <mario@smbclan.net>

Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
author Mario <mario@smbclan.net>
Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
committer Mario <mario@smbclan.net>
Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge
diff --cc qcsrc/common/vehicles/sv_vehicles.qc
Simple merge
diff --cc qcsrc/common/weapons/weapon/electro.qc
Simple merge
diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge
author	Mario <mario@smbclan.net>
	Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
committer	Mario <mario@smbclan.net>
	Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
		1	2
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/electro.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_assault.qc	patch \|	diff1 \|	diff2 \|	blob \| history