From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 May 2014 17:30:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/snort-update' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=dbe2a1cc36f78e1cf48150dc4e1756be1d04abce;hp=-c

Merge remote-tracking branch 'stevee/snort-update' into next
---

dbe2a1cc36f78e1cf48150dc4e1756be1d04abce