Merge branch 'next'

diff --combined html/cgi-bin/credits.cgi
index 02dfb889edc75eb337c397ad4aa6dee0c7273a3e,fe838157fbeba71291dee05fd5aa2305a8f693e5..cc0b958ce5456e9ba4a3194242b918492e6d943a
--- 1/html/cgi-bin/credits.cgi
--- 2/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@@ -67,8 -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,9 -82,10 +82,9 @@@ Stephan Feddersen
  Timo Eissler,
  Jan Lentfer,
  Marcus Scholz,
 -Stéphane Pautrel,
  Ersan Yildirim,
 -Adolf Belka,
+ Jörn-Ingo Weigert,
- Joern-Ingo Weigert,
 +Stéphane Pautrel,
  Alexander Koch,
  Wolfgang Apolinarski,
  Alfred Haas,
@@@ -96,11 -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,
@@@ -108,7 -109,6 +108,6 @@@ David Kleuker
  Hans Horsten,
  Jakub Ratajczak,
  Jorrit de Jonge,
- Jörn-Ingo Weigert,
  Przemek Zdroik,
  Ramax Lo,
  Alexander Rudolf Gruber,
@@@ -129,7 -129,6 +128,7 @@@ Julian McConnell
  Kay-Michael Köhler,
  Kim Wölfel,
  Logan Schmidt,
 +Marcel Follert,
  Markus Untersee,
  Mathew McBride,
  Nico Prenzel,