Merge branch 'next'

diff --cc 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
@@@ -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,