Luke Imhoff 43511e648a Merge branch 'chore/MSP-11614/remove-msf-db-manager-sink' into feature/MSP-11605/lazy-thread-creation ...

MSP-11605

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

2014-11-14 11:59:12 -06:00

..

matchers

Merge staging/great-backport to master

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

shared

Merge branch 'chore/MSP-11614/remove-msf-db-manager-sink' into feature/MSP-11605/lazy-thread-creation

2014-11-14 11:59:12 -06:00