[Bro-Dev] [Fwd] [Bro-Commits] [git/bro] master: Merge remote-tracking branch 'origin/topic/bernhard/software' (2cd88ee)

[Robin Sommer]

Both external test suites are failing in software.bro due to this
merge (I'm guessing).

Robin

----- Forwarded message from Seth Hall <seth at icir.org> -----

Date: Fri, 3 Feb 2012 13:18:47 -0800
From: Seth Hall <seth at icir.org>
To: bro-commits at bro-ids.org
Subject: [Bro-Commits] [git/bro] master: Merge remote-tracking branch
	'origin/topic/bernhard/software' (2cd88ee)
Message-Id: <201202032118.q13LIld4019875 at bro-ids.icir.org>
Reply-To: bro-dev at bro-ids.org

Repository : ssh://git@bro-ids.icir.org/bro

On branch  : master
Link       : http://tracker.bro-ids.org/bro/changeset/2cd88ee4f693657e8d880f88ef67744bebfadba9/bro

--------


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