Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 4945e6ef8528a8d34deb799cbe59910a0cbfd378..d4c53822b5afba7b18dd28ef5e5c655a9c83ae56 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -59,6 +59,10 @@ Vice Project Leader - Christian Schmidt
 (<a href='mailto:maniacikarus\@ipfire.org'>maniacikarus\@ipfire.org</a>)<br />
 Developer - Arne Fitzenreiter
 (<a href='mailto:arne\@ipfire.org'>arne\@ipfire.org</a>)<br />
+Developer - Stefan Schantl
+(<a href='mailto:Stevee\@ipfire.org'>Stevee\@ipfire.org</a>)<br />
+Developer (Addons) - Peter Pfeiffer
+(<a href='mailto:peterman\@ipfire.org'>peterman\@ipfire.org</a>)<br />
 Developer & Webmaster - Heiner Schmeling
 (<a href='mailto:cm\@ipfire.org'>cm\@ipfire.org</a>)<br />
 Supporter, WIKI Administrator & Sponsor - Ronald Wiesinger