Brandon Turner 19ba7772f3 Revert "Various merge resolutions from master <- staging" ... This reverts commit 149c3ecc63. Conflicts: lib/metasploit/framework/command/base.rb lib/metasploit/framework/common_engine.rb lib/metasploit/framework/require.rb lib/msf/core/modules/namespace.rb modules/auxiliary/analyze/jtr_postgres_fast.rb modules/auxiliary/scanner/smb/smb_login.rb msfconsole		2014-08-22 10:17:44 -05:00
..
database.rb	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00