Merge to 4.2.0

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 *.orig
 *.local
+*.lockone
 .#*
 
 # Configuration not in git
@@ -10,6 +11,8 @@ conf/httpd.conf
 conf/named.conf
 conf/pf.conf
 conf/*.lock
+conf/*.lockonce
+conf/log.conf.d/*.conf
 conf/nessus/
 conf/currently-at
 bin/pfcmd
@@ -21,6 +24,39 @@ db/pf-schema.sql
 raddb/eap.conf
 raddb/radiusd.conf
 raddb/sql.conf
+conf/templates/*
+conf/adminroles.conf
+conf/authentication.conf
+conf/floating_network_device.conf
+conf/guest-managers.conf
+conf/log.conf
+conf/chi.conf
+conf/nessus/remotescan.nessus
+conf/networks.conf
+conf/radiusd/eap.conf
+conf/radiusd/radiusd.conf
+conf/radiusd/sql.conf
+conf/snort/classification.config
+conf/snort/local.rules
+conf/snort/reference.config
+conf/switches.conf
+conf/httpd.conf.d/ssl-certificates.conf
+conf/iptables.conf
+conf/listener.msg
+conf/mdm.conf
+conf/popup.msg
+conf/profiles.conf
+conf/snmptrapd.conf
+conf/snort.conf
+conf/snort.conf.pre_snort-2.8
+conf/suricata.yaml
+conf/ui-global.conf
+conf/violations.conf
+html/captive-portal/captive_portal.conf
+conf/pfdetect_remote.conf
+conf/pfarp_remote.conf
+conf/allowed-gaming-oui.txt
+
 
 # translations
 conf/locale/*/*/*.mo

CREDITS

@@ -23,13 +23,17 @@ Ludovic Marcotte
 Tino Matysiak <[email protected]>
 Abhijit Menon-Sen
 Joao Moreira
+Louis Munro
+Loick Pelet
 Jean Raby
 Maikel van der Roest
 James Rouzier
 Ponpitak Santipaptawon
+Julien Semaan
 Philipp Snizek
 Juan Camilo Valencia <[email protected]>
 Mario Varelli <[email protected]>
 Olivier Roch Vilato
 Derek Wuelfrath
-zappo <[email protected]>
+Ludovic Zammit
+zappo <[email protected]>