David Maloney aeda74f394 Merge branch 'master' into staging/electro-release ...

Conflicts:
	Gemfile
	Gemfile.lock

2014-07-07 16:41:23 -05:00

..

auxiliary

Merge branch 'master' into staging/electro-release

2014-07-07 16:41:23 -05:00

encoders

Spelling and grammar on new release modules

2014-04-07 12:18:13 -05:00

exploits

Merge branch 'master' into staging/electro-release

2014-07-07 16:41:23 -05:00

nops

Redo the boilerplate / splat

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

payloads

Description/whitespace changes (minor)

2014-07-07 12:39:05 -05:00

post

Merge branch 'master' into staging/electro-release

2014-07-07 16:41:23 -05:00