Merge remote-tracking branch 'mfischer/snort' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:04:05 +0000 (00:04 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 23:04:05 +0000 (00:04 +0100)

Trivial merge