Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
	suricata/suricata.nm

diff --cc suricata/suricata.nm
index 2b94537d4a69d8c45708909d8d01ec3dc52fa01b,ed5e63281843faf59ed8683686d99dc7f63db33f..69c863287d1b96fa9f9fb05cc0999dc34a3e4df5
--- 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.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/