Matt Buck 8163c3cdda Merge branch 'master' into staging/rails-4.0 ...

Conflicts:
	Gemfile.lock
	plugins/nessus.rb

2015-04-28 15:33:46 -05:00

..

contexts

Remove the helper as well.

2014-12-18 13:28:04 -06:00

examples

Merge branch 'master' into staging/rails-4.0

2015-04-28 15:33:46 -05:00