1002 commits

Author	SHA1	Message	Date
Jon Siwek	41dd0b98e9	Merge branch 'master' into topic/jsiwek/reorg-followup ... Conflicts: scripts/base/frameworks/cluster/setup-connections.bro scripts/base/frameworks/metrics/main.bro scripts/base/frameworks/notice/actions/email_admin.bro scripts/base/frameworks/notice/weird.bro scripts/base/protocols/mime/file-hash.bro scripts/base/protocols/mime/file-ident.bro scripts/policy/frameworks/communication/listen-clear.bro scripts/policy/frameworks/communication/listen-ssl.bro scripts/policy/frameworks/control/controller.bro scripts/policy/frameworks/metrics/http-example.bro scripts/policy/frameworks/metrics/ssl-example.bro scripts/policy/protocols/conn/scan.bro src/CMakeLists.txt	2011-08-15 15:34:25 -05:00
Jon Siwek	c3fb0ea035	Reorganizing btest/policy directory to match new scripts/ organization ... Addresses #545	2011-08-11 10:43:11 -05:00