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
..
readers	Merge branch 'topic/robin/sqlite-merge'	2013-05-15 16:03:19 -07:00
__load__.bro	Merge branch 'topic/robin/sqlite-merge'	2013-05-15 16:03:19 -07:00
main.bro	Infrastructure for modularizing protocol analyzers.	2013-03-29 19:59:31 -07:00