Merge remote-tracking branch 'stevee/snort-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 May 2014 17:30:02 +0000 (19:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 May 2014 17:30:02 +0000 (19:30 +0200)

Trivial merge