Land #2236 - Cogent DataHub HTTP Server Buffer Overflow
Land #2235, @wchen-r7's patch for [SeeRM #6264]
php_include - uses verbose
php_include - fix check
php_include - added error handler
add osvdb ref for openx backdoor
add osvdb ref for chasys overflow
Merge branch 'raidsonic_telnet' of https://github.com/jvazquez-r7/metasploit-framework into raidsonic-ib5220-exec

Conflicts:
	modules/exploits/linux/http/raidsonic_nas_ib5220_exec_noauth.rb
little fixes
Land #2239, OSVDB refs for Chasys and OpenX
OSX keylogger module finally working.
Minor fixes to keylogger.
Fix for bug #8297
Fixed getting the policy_hash_list which can fail if elements are null
[SeeRM #89297]
Land #2241 - Fix undefined method `text' for nil:NilClass
Adds fixes from @wchen-r7.
[FixRM #8312] - Fix file handle leaks

Fix file handle leaks for [SeeRM #8312]
What Luke said.

"You cannot, in general, place a variable declaration in a begin
scope and use it in the ensure scope unless you use nil?. It is
better to swap line 35 and line 34."
Merge remote-tracking branch 'upstream/master' into python-meterpreter-dev
Land #2234, @ndavis-r7's patch for [SeeRM #8296]
removed user and pass option