[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

Open Fastpath Commits
======================

Commit       Component    Author           Date        Summary
-----------  -----------  ---------------  ----------  ------------------------------------------------------------
26007f4 [1]  bro          Daniel Thayer    2015-04-29  Update usage output and list of cmd-line options
cb91a9c [2]  bro          Vlad Grigorescu  2015-04-29  A small fix to ssh/geo-data.bro. ssh can now be unset for lo


[1]  26007f4  https://github.com/bro/bro/commit/26007f419ee51160717588f34ca7930f831a3761
[2]  cb91a9c  https://github.com/bro/bro/commit/cb91a9c10157f8fc01397f5f638595e35231e283