Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/151/update.sh b/config/rootfiles/oldcore/151/update.sh
index 16135b2efe185c0b1fb0d9d2baa8965fa483edc5..699528274a8fbaf8e047ed930e482936b37bae2f 100644 (file)
--- a/config/rootfiles/oldcore/151/update.sh
+++ b/config/rootfiles/oldcore/151/update.sh
@@ -50,6 +50,9 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
 /etc/init.d/sshd restart
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index fe838157fbeba71291dee05fd5aa2305a8f693e5..cc0b958ce5456e9ba4a3194242b918492e6d943a 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -67,8 +67,8 @@ Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Peter Müller,
-Erik Kapfer,
 Jan Paul Tücking,
+Erik Kapfer,
 Jonatan Schlag,
 Dirk Wagner,
 Marcel Lorenz,
@@ -82,10 +82,9 @@ Stephan Feddersen,
 Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
-Stéphane Pautrel,
 Ersan Yildirim,
 Jörn-Ingo Weigert,
-Adolf Belka,
+Stéphane Pautrel,
 Alexander Koch,
 Wolfgang Apolinarski,
 Alfred Haas,
@@ -97,11 +96,11 @@ Florian Bührle,
 Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
+Adolf Belka,
 Alex Koch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
-Marcel Follert,
 Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
@@ -129,6 +128,7 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Marcel Follert,
 Markus Untersee,
 Mathew McBride,
 Nico Prenzel,