rapid7/metasploit-framework — pull request #3243 by todb-r7 (2014-04-11 20:09:17+00:00)
Title: Merge release back into master

Needed to get the version numbers sorted.

Dunno if this is already on @bturner-r7's TODO list today but figured I'd make it easy for him if it is.