Added module credit as this has turned into a rewrite ;)
Correct SAP Table Name
Lack of action moved the deadline to Mar15

Because this change was delayed in getting
reviewed and landed, moved the SVN deadline
out two weeks.
Merge branch 'master' of git://github.com/rapid7/metasploit-framework

Conflicts:
	modules/exploits/windows/browser/foxit_reader_plugin_url_bof.rb
Fix nil deref when dnsdomain is empty
Merge branch 'bigant_server_sch_dupf_bof' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-bigant_server_sch_dupf_bof
Minor changes
Merge branch 'bigant_server_dupf_upload' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-bigant_server_dupf_upload
Correct tab
Merge branch 'openemr_upload_exec' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-openemr_upload_exec
Make psexec mixin a bit better

* Removes copy-pasted code from psexec_command module and uses the mixin
  instead

* Uses the SMB protocol to delete files rather than psexec'ing to call
  cmd.exe and del

* Replaces several instances of "rescue StandardError" with better
  exception handling so we don't accidentally swallow things like
  NoMethodError

* Moves file reading and existence checking into the Exploit::SMB mixin
Merge branch 'hp_vsa_exec_9' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-hp_vsa_exec_9
Merge branch 'huntersearchdirection' of github.com:corelanc0d3r/metasploit-framework into corelanc0d3r-huntersearchdirection
Move SMB mixins into their own directory
Merge branch 'rapid7' into R3dy-psexec-mixin2
Merge branch 'fixgenericcustom' of github.com:rsmudge/metasploit-framework into rsmudge-fixgenericcustom
Merge pull request #3 from jlee-r7/R3dy-psexec-mixin2

Changes that I think make the psexec mixin better
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
There's no HttpClient, so it shouldn't be using normalize_uri
Merge branch 'sap_url_update' of github.com:ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-sap_url_update