From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 29 Jan 2012 10:53:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/ids'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35448a5fbe66a1dee7f7daae1d03d77d59cd3f4f;p=ipfire-3.x.git

Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
	suricata/suricata.nm
---

35448a5fbe66a1dee7f7daae1d03d77d59cd3f4f
diff --cc suricata/suricata.nm
index 2b94537d4,ed5e63281..69c863287
--- 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.2.1
 -release   = 1
 +name       = suricata
- version    = 1.1.1
- release    = 1
++version    = 1.2.1
++release    = 2
  
  groups     = Networking/IDS
  url        = http://www.openinfosecfoundation.org/