Robin Sommer eb637f9f3e Merge remote-tracking branch 'origin/master' into topic/robin/plugins ... Thanks to git this merge was less troublesome that I was afraid it would be. Not all tests pass yet though (and file hashes have changed unfortunately). Conflicts: cmake doc/scripts/DocSourcesList.cmake scripts/base/init-bare.bro scripts/base/protocols/ftp/main.bro scripts/base/protocols/irc/dcc-send.bro scripts/test-all-policy.bro src/AnalyzerTags.h src/CMakeLists.txt src/analyzer/Analyzer.cc src/analyzer/protocol/file/File.cc src/analyzer/protocol/file/File.h src/analyzer/protocol/http/HTTP.cc src/analyzer/protocol/http/HTTP.h src/analyzer/protocol/mime/MIME.cc src/event.bif src/main.cc src/util-config.h.in testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/istate.events-ssl/receiver.http.log testing/btest/Baseline/istate.events-ssl/sender.http.log testing/btest/Baseline/istate.events/receiver.http.log testing/btest/Baseline/istate.events/sender.http.log		2013-05-16 17:58:48 -07:00
..
communication	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
control	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
dpd	Test-suite passes.	2013-03-26 15:40:23 -07:00
intel	FileAnalysis: change terminology s/action/analyzer	2013-04-11 14:53:54 -05:00
signatures	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
software	Fixed a bug in the vulnerable software script and added a test.	2013-04-25 14:56:14 -04:00