[Bro-Dev] [Auto] Merge Status

[Robin Sommer]

On Sun, Jun 01, 2014 at 00:00 -0700, you wrote:

> cb76145 [2]  broctl       Daniel Thayer  2014-05-30  Fix for capstats to display correct interface name
> 4aae8da [3]  broctl       Daniel Thayer  2014-05-29  Fix for capstats with PF_RING+DNA pfdnacluster_master

Merging these.

Robin


-- 
Robin Sommer * Phone +1 (510) 722-6541 *     robin at icir.org
ICSI/LBNL    * Fax   +1 (510) 666-2956 * www.icir.org/robin