Tod Beardsley 017a44c0ae Revert errored merge of deea30d ...

Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"

This reverts commit deea30ddb4, reversing
changes made to 14514d7b8b.

2014-11-11 14:38:47 -06:00

..

auxiliary

Revert errored merge of deea30d

2014-11-11 14:38:47 -06:00

encoders

Land #3770, resolve random stager bugs

2014-11-03 14:15:14 -06:00

exploits

Land #4161, "stop" NilClass fix

2014-11-09 19:37:32 -06:00

nops

Fix up comment splats with the correct URI

2014-10-17 11:47:33 -05:00

payloads

Fix up comment splats with the correct URI

2014-10-17 11:47:33 -05:00

post

Land #4004, @martinvigo's LastPass master password extraction module

2014-10-22 16:34:54 -07:00