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

..

browser

Fix email format

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

elasticsearch

Nuke extra space at EOL

2014-06-02 14:22:01 -05:00

fileformat

Fix first chunk of msftidy "bad char" errors

2014-03-11 11:18:54 -05:00

ftp

Saving progress

2014-01-21 17:14:55 -06:00

http

Resolves some Login::Status migration issues

2014-07-16 21:52:08 -05:00

ids

Fix caps on module titles (first pass)

2013-11-15 00:03:42 -06:00

misc

Fix bad use of sock.get() and check() implementations

2014-06-28 16:05:05 -05:00

ntp

Fix caps on module titles (first pass)

2013-11-15 00:03:42 -06:00

php

Fix email format

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

realserver

Saving progress

2014-01-21 13:03:36 -06:00

samba

Remove EOL spaces

2013-11-20 15:08:13 -06:00

sap

Allow quotes in CmdStagerFlavor metadata

2014-06-27 08:34:56 -04:00

script

Mark windows/misc/psh_web_delivery as deprecated

2014-07-16 14:02:05 -04:00

ssh

Use a semi-intelligent OptEnum for CMDSTAGER::FLAVOR

2014-06-27 08:34:57 -04:00

svn

Saving progress

2014-01-21 13:03:36 -06:00

upnp

Land #2464, fixes for llmnr_response and friends

2013-12-10 13:41:45 -06:00

vnc

Add empty directories from svn repo.

2011-11-09 18:41:40 -06:00

wyse

Redo the boilerplate / splat

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

handler.rb

Redo the boilerplate / splat

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