darkbushido 26e7fe15f9 Merge branch 'upstream' into staging/rails-4.0 ...

Conflicts:
	Gemfile.lock

2015-05-05 11:00:38 -05:00

..

active_record/connection_adapters/abstract_adapter

fixing a connection pool spec

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

metasploit/framework

Land #5102, @wchen-r7's ManageEngine Desktop Central Login Utility

2015-05-01 15:20:21 -05:00

msf

Restore specs

2015-04-27 17:00:19 -05:00

rex

Land #5214, initial meterpreter session recovery support

2015-05-04 16:25:27 -05:00