Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
	suricata/suricata.nm

diff --cc suricata/suricata.nm
index 7c4cec5afadd675a04b9eafbcf148c8d46ed0ae4,780c29509c0327883544d79b41c8a59fd61df66d..d1e67e2375ac6f021fac65524403ba73ad3de056
--- 1/suricata/suricata.nm
--- 2/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/