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
..
aix	Catch mis-formatted bracket comments.	2013-10-15 14:52:12 -05:00
cisco/gather	Redo the boilerplate / splat	2013-10-15 13:51:57 -05:00
firefox	Kill newline (race @wvu-r7 on this)	2014-06-16 11:46:08 -05:00
linux	Fix linux download_exec for #2961	2014-03-20 12:09:38 -05:00
multi	Added newline at EOF	2014-06-17 21:03:18 +02:00
osx	Space at EOL	2013-12-26 10:37:18 -06:00
solaris/gather	Catch mis-formatted bracket comments.	2013-10-15 14:52:12 -05:00
windows	Merge branch 'master' into feature/recog	2014-07-06 09:17:44 -05:00