From: Russ Combs <rucombs@cisco.com>
Date: Wed, 22 Oct 2014 19:35:18 +0000 (-0400)
Subject: pulled in latest from tom and josh
X-Git-Tag: 3.0.0-233~1342
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2036667df5dcbc210db968ad7ac2b68b10bcb25;p=thirdparty%2Fsnort3.git

pulled in latest from tom and josh
---

diff --git a/ChangeLog b/ChangeLog
index ef4905a25..db4ea36f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 -- refactored splitter fallback
 -- fix binder.use.service
 -- refactored flow state
+-- latest from tom and josh 10/22 15:27
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to