[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

Open Merge Requests
===================

ID            Component    Reporter       Assignee      Updated       For Version  Priority    Summary
------------  -----------  -------------  ------------  ----------  -------------  ----------  -------------------------------------
BIT-1375 [1]  Bro          Johanna Amann  -             2015-04-14            2.4  Normal      Please merge topic/johanna/ca-list
BIT-1374 [2]  BroControl   Daniel Thayer  Justin Azoff  2015-04-13            2.4  Normal      topic/dnthayer/more-fixes-for-2.4 [3]


Open GitHub Pull Requests
=========================

Issue    Component    User         Updated     Title
-------  -----------  -----------  ----------  ----------------------------------------------
#29 [4]  bro          jshlbrd [5]  2015-03-25  Add PROXY-AUTHORIZATION header to http.log [6]


[1]  BIT-1375                     https://bro-tracker.atlassian.net/browse/BIT-1375
[2]  BIT-1374                     https://bro-tracker.atlassian.net/browse/BIT-1374
[3]  more-fixes-for-2.4           https://github.com/bro/brocontrol/tree/topic/dnthayer/more-fixes-for-2.4
[4]  Pull Request #29             https://github.com/bro/bro/pull/29
[5]  jshlbrd                      https://github.com/jshlbrd
[6]  Merge Pull Request #29 with  git pull --no-ff --no-commit https://github.com/jshlbrd/bro.git patch-2