rapid7/metasploit-framework — pull request #2561 by wvu-r7 (2013-10-21 22:48:16+00:00)
Title: Resubmitting @jlee-r7's #2505 with fixes

Since msfcli blew up.