Brandon Turner 91bb0b6e10 Merge tag '2014072301' into staging/electro-release ...

Conflicts:
	Gemfile.lock
	modules/post/windows/gather/credentials/gpp.rb

This removes the active flag in the gpp.rb module.  According to Lance,
the active flag is no longer used.

2014-08-06 15:58:12 -05:00

..

auxiliary

Merge tag '2014072301' into staging/electro-release

2014-08-06 15:58:12 -05:00

encoders

Fix email format

2014-07-11 12:45:23 -05:00

exploits

Merge tag '2014072301' into staging/electro-release

2014-08-06 15:58:12 -05:00

nops

Redo the boilerplate / splat

2013-10-15 13:51:57 -05:00

payloads

Land #3484, bad pack/unpack specifier fix

2014-07-16 14:52:23 -05:00

post

Merge tag '2014072301' into staging/electro-release

2014-08-06 15:58:12 -05:00