From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Dec 2011 22:24:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/ids'
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=d51784276a43b567b282f703e0853395c5176e71

Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
	suricata/suricata.nm
---

d51784276a43b567b282f703e0853395c5176e71
diff --cc suricata/suricata.nm
index f06c66c4b,8464c05df..2b94537d4
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@@ -3,9 -3,9 +3,9 @@@
  # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
  ###############################################################################
  
 -name      = suricata
 -version   = 1.1.1
 -release   = 1
 +name       = suricata
- version    = 1.1
- release    = 2
++version    = 1.1.1
++release    = 1
  
  groups     = Networking/IDS
  url        = http://www.openinfosecfoundation.org/