Merge branch 'winamp_maki_bof' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-winamp_maki_bof

Author: sinn3r

modules/exploits/windows/fileformat/winamp_maki_bof.rb

@@ -67,6 +67,8 @@ def initialize(info = {})
 			'Privileged'     => false,
 			'DisclosureDate' => 'May 20 2009',
 			'DefaultTarget'  => 0))
+
+		deregister_options('FILENAME')
 	end
 
 	def file_format_filename