Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Merge branch 'master' of github.com:dougsko/metasploit-framework
database.yml.example