[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

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

ID            Component    Reporter       Assignee       Updated       For Version  Priority    Summary
------------  -----------  -------------  -------------  ----------  -------------  ----------  ------------------------------------------------------------------------
BIT-1367 [1]  Bro          Johanna Amann  Johanna Amann  2015-04-06            2.4  Normal      Type clashing problem when records with default values are used in sets.


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

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


[1]  BIT-1367                     https://bro-tracker.atlassian.net/browse/BIT-1367
[2]  Pull Request #29             https://github.com/bro/bro/pull/29
[3]  jshlbrd                      https://github.com/jshlbrd
[4]  Merge Pull Request #29 with  git pull --no-ff --no-commit https://github.com/jshlbrd/bro.git patch-2