Matt Buck f29a3f69e9 Merge branch 'master' into staging/rails-4.0 ...

Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec

2015-03-17 15:47:48 -05:00

..

active_record/connection_adapters/abstract_adapter

fixing a connection pool spec

2014-09-29 14:39:40 -05:00

metasploit/framework

Fix rspec

2015-02-20 22:08:09 -06:00

msf

Refactor x86 Windows reverse_http and reverse_https stagers

2015-03-10 12:48:30 -05:00

rex

Sort cases and add specs

2015-03-08 23:27:32 -05:00