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

Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec

2015-03-17 15:47:48 -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-03-17 15:47:48 -05:00