Meatballs1/metasploit-framework — pull request #5 by todb-r7 (2013-05-02 14:57:01+00:00)
Title: Resolve conflict in upstream PR #1778

This should resolve rapid7/metasploit-framework#1778 's conflicted state. @Meatballs1 used print_line, @jlee-r7 used print_status, and intra-line diffs will tend to cause conflicts like this.