Merge branch 'foxit_reader_plugin_url_bof' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-foxit_reader_plugin_url_bof
Randomize some gadgets
Merge branch 'master' of git://github.com/rapid7/metasploit-framework

Conflicts:
	modules/exploits/windows/browser/foxit_reader_plugin_url_bof.rb
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Merge branch 'sap_url_update' of github.com:ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-sap_url_update
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Bleh, I fucked up this file
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Add CVE-2013-0803

From:
http://dev.metasploit.com/redmine/issues/7691
Uses normalize_uri
Merge branch 'polar_cms_upload_exec' of github.com:wchen-r7/metasploit-framework into wchen-r7-polar_cms_upload_exec