Merge branch 'snort'
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 19 Jul 2016 08:39:19 +0000 (10:39 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Tue, 19 Jul 2016 08:39:19 +0000 (10:39 +0200)

Trivial merge