initial commit
small updates
Merge branch 'master' of git://github.com/rapid7/metasploit-framework into dlink-dir300-600-execution
return
little cleanup plus msftidy compliant
Add some docs to FtpServer
deleting trailing comma
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
Merge pull request #2 from jvazquez-r7/dlink_review

little cleanup plus msftidy compliant
Merge branch 'dlink-dir300-600-execution' of https://github.com/m-1-k-3/metasploit-framework into m-1-k-3-dlink-dir300-600-execution
Merge branch 'master' into autoload