From: Josh <jrosenba@cisco.com>
Date: Fri, 13 Jun 2014 19:27:20 +0000 (-0400)
Subject: Merge branch 'convert_conf'
X-Git-Tag: 3.0.0-233~1481^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=448d5164b62fe42de48c4ac92bf2cd4bda68b03f;p=thirdparty%2Fsnort3.git

Merge branch 'convert_conf'
---

448d5164b62fe42de48c4ac92bf2cd4bda68b03f