From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 23 Nov 2011 21:28:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/ids'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bcf28fd5f630d0808e2f7c8db339b94b50e897e;p=ipfire-3.x.git

Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
	suricata/suricata.nm
---

7bcf28fd5f630d0808e2f7c8db339b94b50e897e
diff --cc suricata/suricata.nm
index 7c4cec5af,780c29509..d1e67e237
--- 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
 -release   = 2
 +name       = suricata
 +version    = 1.1
- release    = 1
++release    = 2
  
  groups     = Networking/IDS
  url        = http://www.openinfosecfoundation.org/