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

..

aix

fix aix hashdump

2014-06-24 15:23:37 -05:00

cisco/gather

Redo the boilerplate / splat

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

firefox

Kill newline (race @wvu-r7 on this)

2014-06-16 11:46:08 -05:00

linux

Merge branch 'master' into staging/electro-release

2014-07-16 09:38:44 -05:00

multi

Merge tag '2014072301' into staging/electro-release

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

osx

Fix broken NTLM hash format

2014-06-30 11:35:28 -05:00

solaris/gather

Catch mis-formatted bracket comments.

2013-10-15 14:52:12 -05:00

windows

Merge tag '2014072301' into staging/electro-release

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