Trevor Rosen 75333702a2 Merge branch 'land/4028' into upstream-master ... Land #4028		2014-10-23 12:36:35 -05:00
..
active_record/connection_adapters/abstract_adapter	Solve conflicts	2014-08-26 09:04:05 -05:00
metasploit/framework	Move Tcp specs into their own shared example	2014-10-22 09:16:14 -05:00
msf	Merge branch 'land/4028' into upstream-master	2014-10-23 12:36:35 -05:00
rex	Land #3767, @jvazquez-r7's specs for Rex::Encoder::XDR	2014-10-22 09:22:53 -07:00