Merge branch 'master' into Mario/wepent_experimental

author Mario <mario@smbclan.net>

Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)

committer Mario <mario@smbclan.net>

Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)
author Mario <mario@smbclan.net>
Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)
committer Mario <mario@smbclan.net>
Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)
diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge
author	Mario <mario@smbclan.net>
	Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)
committer	Mario <mario@smbclan.net>
	Fri, 16 Dec 2016 03:45:00 +0000 (13:45 +1000)