Merge branch 'pr2301' into upstream-master

Conflicts:
	modules/auxiliary/scanner/http/wordpress_login_enum.rb
bug/bundler_fix
sinn3r 2013-09-12 14:52:34 -05:00
commit 91b8ca8f22
1 changed files with 1 additions and 0 deletions

View File

@ -245,4 +245,5 @@ class Metasploit3 < Msf::Auxiliary
return usernames
end
end