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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 18 Dec 2011 22:24:04 +0000 (23:24 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 18 Dec 2011 22:24:04 +0000 (23:24 +0100)
commit	d51784276a43b567b282f703e0853395c5176e71
tree	6ad9b5a921f804794adf9871dd28fbfa6a155ef9	tree \| snapshot
parent	9d2ad5e3de995b394528d567cf950a8ce863f099	commit \| diff
parent	b28ed22c54002f748312dec407118576d39e3969	commit \| diff

Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
suricata/suricata.nm