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 337e8bc22f4a9b05d82d1d22d28580c9e5a06376..bf3d6f4cdce0149a08726e61b15b62c9c34c6c90 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -67,8 +67,8 @@ Alexander Marx,
 Stefan Schantl,
 Matthias Fischer,
 Jan Paul Tücking,
-Jonatan Schlag,
 Peter Müller,
+Jonatan Schlag,
 Erik Kapfer,
 Dirk Wagner,
 Marcel Lorenz,
@@ -83,17 +83,20 @@ Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
 Joern-Ingo Weigert,
+Alexander Koch,
+Stephan Feddersen,
 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,
-Stéphane Pautrel,
-Bernhard Bitsch,
+Alex Koch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
@@ -105,7 +108,8 @@ Jakub Ratajczak,
 Jorrit de Jonge,
 Jörn-Ingo Weigert,
 Przemek Zdroik,
-Alexander Koch,
+Ramax Lo,
+Tim FitzGeorge,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
@@ -125,6 +129,7 @@ Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
 Nico Prenzel,
+Oliver Fuhrer,
 Osmar Gonzalez,
 Paul T. Simmons,
 Rob Brewer,
@@ -132,7 +137,6 @@ Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
 Thomas Ebert,
-Tim FitzGeorge,
 Timmothy Wilson,
 Umberto Parma
        <!-- END -->