HD Moore 43d65cc93a Merge branch 'master' into feature/recog ...

Resolves conflicts:
	Gemfile
	data/js/detect/os.js
	modules/exploits/android/browser/webview_addjavascriptinterface.rb

2014-07-06 09:17:44 -05:00

..

browser

Merge branch 'master' into feature/recog

2014-07-06 09:17:44 -05:00

fileformat

Minor spacing and word choice fixups

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