From: Josh <jrosenba@cisco.com>
Date: Mon, 23 Jun 2014 17:40:09 +0000 (-0400)
Subject: Merge branch 'convert_conf' of /nfs/home/jrosenba/mac into convert_conf
X-Git-Tag: 3.0.0-233~1175^2~25^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71c9ccde4e52ca1f5efd966a5dd18c15024f3658;p=thirdparty%2Fsnort3.git

Merge branch 'convert_conf' of /nfs/home/jrosenba/mac into convert_conf
---

71c9ccde4e52ca1f5efd966a5dd18c15024f3658