wchen-r7/metasploit-framework — pull request #23 by jvennix-r7 (2014-10-01 18:15:38+00:00)
Title: Merge master into the branch to resolve conflicts.

Merging master back into the branch. If this isn't the usual way you guys fix merge conflicts, let me know.