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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 29 Jan 2012 10:53:44 +0000 (11:53 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 29 Jan 2012 10:53:44 +0000 (11:53 +0100)
commit	35448a5fbe66a1dee7f7daae1d03d77d59cd3f4f
tree	f654b3c4d9c8d2e1dfbce7fc8b21b5225728aa74	tree \| snapshot
parent	1c9b6c79d917e0d441be685915872d092db032c5	commit \| diff
parent	f5a18d677428ae9e1d3a27790d6b2da951081a89	commit \| diff

Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
suricata/suricata.nm