From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 23 Aug 2018 08:34:17 +0000 (+0200)
Subject: Fix merge conflicts during merge of next and the suricata branch
X-Git-Tag: suricata-beta3~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb52183c6a311d7413c286f73895b52a8e2e3a57;p=people%2Fstevee%2Fipfire-2.x.git

Fix merge conflicts during merge of next and the suricata branch
---

cb52183c6a311d7413c286f73895b52a8e2e3a57