[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

> Open Merge Requests for Bro2.1
> ==============================

      Component |    Id     | Reporter   | Owner      | Prio   | Summary
  ------------------------------------------------------------------------------------------------------------------
     BroControl |   812 [1] | dnthayer   |            | Normal | topic/dnthayer/remove-unused-options [2]


> Unmerged Fastpath Commits
> =========================

      Component | Revision   | Committer       | Date       | Summary
  ------------------------------------------------------------------------------------------------------------------
            bro | 6e2205a    | Seth Hall       | 2012-04-21 | Fix problem with extracting FTP passwords. [3]
         broctl | 7471b47    | Daniel Thayer   | 2012-04-19 | Update broctl option descriptions [4]



 [1]       #812: http://tracker.bro-ids.org/bro/ticket/812
 [2] remove-unused-options: http://tracker.bro-ids.org/bro/changeset?old_path=%2Fbrocontrol&old=master&new_path=%2Fbrocontrol&new=topic/dnthayer/remove-unused-options
 [3] fastpath: http://tracker.bro-ids.org/bro/changeset/6e2205aa686cb1c77da8d2b56ed9a1881cb72e7a/bro
 [4] fastpath: http://tracker.bro-ids.org/bro/changeset/7471b47bd41aecdfc6877afa86ba63f04c3bfa4f/broctl