Merge branch 'master' of ssh://git.bro-ids.org/bro

Conflicts:
	scripts/base/frameworks/control/main.bro
This commit is contained in:
Seth Hall 2011-08-05 23:11:40 -04:00
commit d6a67f7c1f
17 changed files with 134 additions and 50 deletions

View file

@ -3,6 +3,7 @@
##! currently detected.
##!
##! TODO:
##!
##! * Find some heuristic to determine if email was sent through
##! a MS Exhange webmail interface as opposed to a desktop client.