Added feature to dump to file leaked memory
Fixed conflict and used OptRegexp type for pattern
fixed conflicts, used OptRegexp for pattern
- Rubbish that was left dangling here around
Fixed store on file option
Restored FTP option
Added feature to dump to file leaked memory
fixed conflicts, used OptRegexp for pattern
- Rubbish that was left dangling here around
Restored FTP option
Conflicts resolution should be ok now
Merge branch 'master' of https://github.com/abes975/metasploit-framework

Conflicts:
	modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
Remove Spaces at EOL, fixed if test on pattern variable
Fixed call to String.match with regexp pattern
Added missing space in comment
Renamed PATTERN_FILTER -> FILTER
Renamed FILTER -> DUMPFILTER, more intuitive and coherent
Cleaned up Array.join call
fixed conflict while merging from heartbleed branch
Fixed a bug...referring to wrong variable after filtering with regexp