Samuel Huckins 149c3ecc63 Various merge resolutions from master <- staging ...

* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing

2014-08-15 11:33:31 -05:00

..

active_record/connection_adapters/abstract_adapter

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

metasploit/framework

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

msf

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

rex

Retab spec

2014-08-01 14:41:20 +01:00

fastlib_spec.rb

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00