Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / credits.cgi

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 08d5a98fbffaea29f07e5016e6da3edcf683fd96..cc0b958ce5456e9ba4a3194242b918492e6d943a 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -62,8 +62,8 @@ print <<END
        <!-- CONTRIBUTORS -->
 Michael Tremer,
 Arne Fitzenreiter,
-Christian Schmidt,
 Stefan Schantl,
+Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Peter Müller,
@@ -83,7 +83,7 @@ Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
-Joern-Ingo Weigert,
+Jörn-Ingo Weigert,
 Stéphane Pautrel,
 Alexander Koch,
 Wolfgang Apolinarski,
@@ -96,6 +96,7 @@ Florian Bührle,
 Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
+Adolf Belka,
 Alex Koch,
 Dominik Hassler,
 Larsen,
@@ -107,10 +108,8 @@ David Kleuker,
 Hans Horsten,
 Jakub Ratajczak,
 Jorrit de Jonge,
-Jörn-Ingo Weigert,
 Przemek Zdroik,
 Ramax Lo,
-Adolf Belka,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
@@ -129,7 +128,9 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Marcel Follert,
 Markus Untersee,
+Mathew McBride,
 Nico Prenzel,
 Oliver Fuhrer,
 Osmar Gonzalez,
@@ -147,16 +148,6 @@ END
 ;
 &Header::closebox();
 
-&Header::openbox("100%", "left", $Lang::tr{'other'});
-print <<END
-       <p>
-               This product includes GeoLite data created by MaxMind, available from
-               <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
-       </p>
-END
-;
-&Header::closebox();
-
 &Header::closebigbox();
 
 &Header::closepage();