Merge branch 'payload_ambiguity' of git://github.com/bonsaiviking/metasploit-framework into bonsaiviking-payload_ambiguity

Author: sinn3r

modules/payloads/stagers/php/bind_tcp_ipv6.rb

@@ -18,6 +18,10 @@ module Metasploit3
 	include Msf::Payload::Stager
 	include Msf::Payload::Php
 
+	def self.handler_type_alias
+		"bind_tcp_ipv6"
+	end
+
 	def initialize(info = {})
 		super(merge_info(info,
 			'Name'          => 'Bind TCP Stager IPv6',