From: Russ Combs <rucombs@cisco.com>
Date: Tue, 14 Oct 2014 18:33:59 +0000 (-0400)
Subject: updates from tom and josh
X-Git-Tag: 3.0.0-233~1381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b113f7545ad83ece856cd595e886fb5b709c0f8d;p=thirdparty%2Fsnort3.git

updates from tom and josh
---

diff --git a/ChangeLog b/ChangeLog
index 2e4b74769..a0ba7575b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 -- converted fast pattern errors to warnings
 -- add check for null gadget in binder
 -- remove cruft from fast pattern config
+-- updates from tom and josh
 
 124
 -- valgrind cleanup