On Tue, Mar 22, 2016 at 00:24 +0100, you wrote:

> If there are no objections, I (or Daniel?) will merge it into the
> broker-integration branch.

Let's merge it into master first, master can then be merged into the
integration branch. It's better to keep things as separate as possible
(I realize that the integration already has quite a bit in there ...)

Robin

-- 
Robin Sommer * ICSI/LBNL * ro...@icir.org * www.icir.org/robin
_______________________________________________
bro-dev mailing list
bro-dev@bro.org
http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev

Reply via email to