Meatballs1/metasploit-framework — pull request #31 by todb-r7 (2013-12-30 22:56:34+00:00)
Title: Unconflict rapid7/metasploit-framework#1421

This gets us back to a place where this thing can actually be reviewed. Sorry for the delay, I do love the WDS stuff.