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 5031e408892e5bbf1ec4661b735174974660d41d..cc0b958ce5456e9ba4a3194242b918492e6d943a 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -62,52 +62,54 @@ print <<END
        <!-- CONTRIBUTORS -->
 Michael Tremer,
 Arne Fitzenreiter,
+Stefan Schantl,
 Christian Schmidt,
 Alexander Marx,
-Stefan Schantl,
 Matthias Fischer,
-Jan Paul Tücking,
-Jonatan Schlag,
 Peter Müller,
+Jan Paul Tücking,
 Erik Kapfer,
+Jonatan Schlag,
 Dirk Wagner,
 Marcel Lorenz,
 Alf Høgemark,
 Ben Schweikert,
 Peter Pfeiffer,
 Daniel Glanzmann,
-Heiner Schmeling,
 Daniel Weismüller,
+Heiner Schmeling,
+Stephan Feddersen,
 Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
-Joern-Ingo Weigert,
+Jörn-Ingo Weigert,
+Stéphane Pautrel,
 Alexander Koch,
 Wolfgang Apolinarski,
 Alfred Haas,
 Lars Schuhmacher,
 Rene Zingel,
 Sascha Kilian,
-Stéphane Pautrel,
 Ronald Wiesinger,
-Stephan Feddersen,
 Florian Bührle,
 Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
+Adolf Belka,
+Alex Koch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
+Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
 David Kleuker,
 Hans Horsten,
 Jakub Ratajczak,
 Jorrit de Jonge,
-Jörn-Ingo Weigert,
 Przemek Zdroik,
-Tim FitzGeorge,
+Ramax Lo,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
@@ -126,6 +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,
@@ -143,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();