Merge branch 'master' into Mario/wepent_experimental

author Mario <mario@smbclan.net>

Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)

committer Mario <mario@smbclan.net>

Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
author Mario <mario@smbclan.net>
Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
committer Mario <mario@smbclan.net>
Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge
author	Mario <mario@smbclan.net>
	Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
committer	Mario <mario@smbclan.net>
	Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)