From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 14 Apr 2016 21:22:33 +0000 (-0400)
Subject: Merge pull request #423 in SNORT/snort3 from crc/s5 to master
X-Git-Tag: 3.0.0-233~453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e9267f41c21eff6ea10489a78da5697151bfd2b;p=thirdparty%2Fsnort3.git

Merge pull request #423 in SNORT/snort3 from crc/s5 to master

* commit '2f3b4798d61999c2531a3c65d7ef3b1207129c84':
  revert delete temporarily
---

3e9267f41c21eff6ea10489a78da5697151bfd2b