Tod Beardsley c5f52ba0b1 Merge master to unstable so it's possible to merge back ...

This should also resolve the conflict introduced by #1913 (and #1062).
Unstable modules should hit the unstable directory to avoid problems like this.

Conflicts:
	unstable-modules/exploits/incomplete/multi/http/splunk_upload_app_exec.rb

2013-11-07 23:37:23 -06:00

..

aix

Redo the boilerplate / splat

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

apple_ios

Resplat another common boilerplate.

2013-10-15 14:07:48 -05:00

bsdi/softcart

Redo the boilerplate / splat

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

dialup/multi/login

Redo the boilerplate / splat

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

freebsd

Land #2426 - make use of Msf::Config.data_directory

2013-10-21 13:07:33 -05:00

hpux/lpd

Redo the boilerplate / splat

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

irix/lpd

Redo the boilerplate / splat

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

linux

Blow away remnants of Local::Unix

2013-11-05 13:51:45 -06:00

multi

Merge master to unstable so it's possible to merge back

2013-11-07 23:37:23 -06:00

netware

Update modules to use new ZDI reference

2013-10-21 15:13:46 -05:00

osx

Various title and description updates

2013-10-28 14:00:19 -05:00

solaris

Redo the boilerplate / splat

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

unix

Land #2569, @averagesecurityguy and others exploit for CVE-2013-4468, CVE-2013-4467

2013-11-07 12:20:42 -06:00

windows

Merge master to unstable so it's possible to merge back

2013-11-07 23:37:23 -06:00