James Lee a65ee6cf30 Land #3373, recog ...

Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb
	modules/exploits/android/browser/webview_addjavascriptinterface.rb

2014-10-03 18:05:58 -05:00

..

browser

Land #3373, recog

2014-10-03 18:05:58 -05:00

fileformat

Minor spacing and word choice fixups

2014-06-16 11:40:21 -05:00