last cleanup for sami_ftpd_list
change from vcmd_exec to a method in the module
check if curl is on the path
Merge pull request #2 from jvazquez-r7/post_download_exec_work

check if curl is on the path
Merge branch 'post_linux_manage_download_exec' of https://github.com/jasbro/metasploit-framework into jasbro-post_linux_manage_download_exec
Update metasploit-data-models to 0.6.3

This updates activerecord to 3.2.13 due to recent vulns.
Update MDM in gemcache
cleanup for nagios_nrpe_arguments
Update metasploit-data-models to 0.6.3

This updates activerecord to 3.2.13 due to recent vulns.
Update MDM in gemcache
Merge branch 'bturner-r7/update-mdm' into release

This lands the Mdm update to release. It shouldn't conflict with master
but if it does, please tell todb@metasploit.com how you resolved it.

[See #1620]
Merge branch 'release' into master

This is effectively an empty commit, but keeps master a descendant of
release.

Conflicts:
	db/schema.rb
	lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.2/spec/dummy/db/schema.rb
	lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.3/spec/dummy/db/schema.rb
Expanding the title and desc for external_ip

Also allowing the capitalization on "via" to be small.
unscrewing syntax error
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
Used msf file mixin where possible and more in memory handling
Merge 'neinwechter/browser_autopwn-updates'

Brings in neinwechter's BAP fixes. Seems to not only be a more sane
strategy, but in practice, ends up with tons more shells for at least
MSIE which is what most people are using it for anyway.

[Closes #1612]
small fixup of unused old vars
Merge pull request #1 from jvazquez-r7/nagios_nrpe_work

cleanup for nagios_nrpe_arguments
feedback included