:xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch...

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --cc config/rootfiles/common/aarch64/initscripts
Simple merge

diff --cc config/rootfiles/common/armv5tel/initscripts
Simple merge

diff --cc config/rootfiles/common/configroot
Simple merge

diff --cc config/rootfiles/common/i586/initscripts
Simple merge

diff --cc config/rootfiles/common/x86_64/initscripts
Simple merge

diff --cc doc/language_issues.en
Simple merge

diff --cc doc/language_issues.es
Simple merge

diff --cc doc/language_issues.it
Simple merge

diff --cc doc/language_issues.nl
Simple merge

diff --cc doc/language_issues.pl
Simple merge

diff --cc doc/language_issues.ru
Simple merge

diff --cc html/cgi-bin/credits.cgi
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc lfs/configroot
index e8626c8129e3a0dd09c9c5a636a74640287d21ad,ee320d8cf2ab365b88ea9ede8bb3fbd2eb56c3eb..0afacebaf731cdef244d476a0e3f67741829bcc6
--- 1/lfs/configroot
--- 2/lfs/configroot
+++ b/lfs/configroot
@@@ -78,8 -78,7 +78,7 @@@ $(TARGET) 
        cp $(DIR_SRC)/config/cfgroot/header.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/general-functions.pl       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/network-functions.pl       $(CONFIG_ROOT)/
 -      cp $(DIR_SRC)/config/cfgroot/geoip-functions.pl         $(CONFIG_ROOT)/
 +      cp $(DIR_SRC)/config/cfgroot/location-functions.pl              $(CONFIG_ROOT)/
-       cp $(DIR_SRC)/config/cfgroot/aws-functions.pl           $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/ids-functions.pl           $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/lang.pl                    $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/countries.pl               $(CONFIG_ROOT)/

diff --cc make.sh
Simple merge

diff --cc src/initscripts/system/firewall
Simple merge