Luke Imhoff 1fd8fe57df Merge staging/great-backport to master ...

Conflicts:
	spec/lib/msf/core/module_spec.rb

2014-11-12 11:08:18 -06:00

..

ui

…

arch.rb

…

author.rb

…

compatibility.rb

Merge staging/great-backport to master

2014-11-12 11:08:18 -06:00

data_store.rb

…

full_name.rb

…

module_info.rb

Merge staging/great-backport to master

2014-11-12 11:08:18 -06:00

module_store.rb

…

network.rb

…

options.rb

Merge staging/great-backport to master

2014-11-12 11:08:18 -06:00

privileged.rb

…

ranking.rb

…

search.rb

…

type.rb

…

ui.rb

…

uuid.rb

…