Meatballs1/metasploit-framework — pull request #1 by todb-r7 (2012-11-09 19:12:48+00:00)
Title: Merge and un-conflict

This resolves the conflicts between rapid7/metasploit-framework and your branch. I chose your edits, and it looks right to me, but haven't tested it thoroughly.

Please take a look and see if this is what you expect. In the end you should be able to again merge this on https://github.com/rapid7/metasploit-framework/pull/636

Once again, sorry for the delay on keeping up on this.