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

..

auxiliary

Merge branch 'master' into staging/rails-4.0

2015-04-06 11:27:00 -05:00

encoders

Fix #4717 - Change AllowWin32SEH's default to false

2015-02-06 12:38:04 -06:00

exploits

Land #5068, @todb-r7's module author cleanup

2015-04-03 16:00:36 -05:00

nops

Fix up comment splats with the correct URI

2014-10-17 11:47:33 -05:00

payloads

Fix up build and missing uri_checksum stuff

2015-04-03 13:42:25 +10:00

post

Use bitwise OR to select both primary and backup DCs

2015-04-05 11:05:42 +01:00