:xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch...

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

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index baa49fd3b820fb3efffb4d4e4a66459f0d678fa4..2f3ee3b4a31d4c5491805214e60157bacbe8d378 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -63,41 +63,44 @@ print <<END
 Michael Tremer,
 Arne Fitzenreiter,
 Christian Schmidt,
-Alexander Marx,
 Stefan Schantl,
+Alexander Marx,
 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,
+Stéphane Pautrel,
+Alexander Koch,
 Wolfgang Apolinarski,
 Alfred Haas,
 Lars Schuhmacher,
 Rene Zingel,
 Sascha Kilian,
 Ronald Wiesinger,
-Stephan Feddersen,
-Stéphane Pautrel,
+Florian Bührle,
+Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
-Bernhard Bitsch,
+Alex Koch,
 Dominik Hassler,
 Larsen,
-Alexander Koch,
 Gabriel Rolland,
+Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
 David Kleuker,
@@ -106,6 +109,8 @@ Jakub Ratajczak,
 Jorrit de Jonge,
 Jörn-Ingo Weigert,
 Przemek Zdroik,
+Ramax Lo,
+Adolf Belka,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
@@ -124,7 +129,9 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Markus Untersee,
 Nico Prenzel,
+Oliver Fuhrer,
 Osmar Gonzalez,
 Paul T. Simmons,
 Rob Brewer,
@@ -132,7 +139,6 @@ Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
 Thomas Ebert,
-Tim FitzGeorge,
 Timmothy Wilson,
 Umberto Parma
        <!-- END -->
@@ -141,16 +147,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();