Matt Buck 5e2d6c27c3 Merge branch 'master' into staging/rails-4.0 ...

Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec

2015-04-06 11:27:00 -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-06 11:27:00 -05:00