git.ipfire.org Git - ipfire-3.x.git/commit

author	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 23 Nov 2011 21:28:29 +0000 (22:28 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 23 Nov 2011 21:28:29 +0000 (22:28 +0100)
commit	7bcf28fd5f630d0808e2f7c8db339b94b50e897e
tree	a5ecdeeedd996709c7e122004c274834488c0220	tree \| snapshot
parent	5235df063e4dea832dfad8c22d689d9d72a43207	commit \| diff
parent	19ef2da5fa728ab6828a77df1013f5dee7662d6c	commit \| diff

Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
suricata/suricata.nm