2 Commits

Author	SHA1	Message	Date
HD Moore	73e4ec709f	Fix smb_port and require 'recog' when no DB/MDM	2014-08-25 15:42:18 -05:00
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