From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Fri, 31 Oct 2014 00:36:56 +0000 (-0400)
Subject: change log update
X-Git-Tag: 3.0.0-233~1291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63fe4766741d835b45313f2c2b5bb62029fdc3b2;p=thirdparty%2Fsnort3.git

change log update
---

diff --git a/ChangeLog b/ChangeLog
index a4d4f53f2..2b8a19c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 -- tweaked S5_TRACE output for consistency
 -- disabled new_http_inspect from REG_TEST (accidentally enabled)
 -- squelch 129:9 and 129:10 if link addrs are swapped
+-- tweaks from Josh
 
 126
 -- pulled latest from tom