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

..

escalate

Missed an errant require

2013-11-05 14:00:55 -06:00

gather

Merge tag '2014072301' into staging/electro-release

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

general

Redo the boilerplate / splat

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

manage

Land #3552 - Correct DbVisualizer title name

2014-07-21 13:07:33 -05:00