Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Land #1973, @wchen-r7's fix to handle ftp auth correctly
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Land #1976 - OSVDB update
Land #1977 - OSVDB update
Land #1978 - OSVDB update
Land #1979 - OSVDB update
Code Review Feedback from wchen
Fixed the disclosure date format
Removed the rport option
Added a call to report_note to store the data
Fixed the date format
Removed the rport option
These are items that were code-review for my other related module, so
I figured they should be done here too
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Added DoS result checking
Lowered the http timeout
Initial commit for havalite module
Make msftidy happy
Land #1981 - Canon Wireless Printer Denial of Service
Final touchup
Land #1980 - Canon Printer Wireless Configuration Disclosure
Final version
If I can't write, I want to know.

It's possible that the upload directory doesn't allow write, the
module should be aware of that.  Other reasons may be possible.
Eh, PHP, not "php"
Correct disclosure date