Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / docs / credits.html

diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 87cb08d..4daf371 100644 (file)
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -29,7 +29,6 @@
 <BR>
 
 <H3>Core Team</H3>
-Jeremy Davis<BR>
 Nathan Kennedy<BR>
 Ivan Kohler<BR>
 Jonathan Prykop<BR>
@@ -41,6 +40,7 @@ Mark Wells<BR>
 
 <H3>Core Emeritus</H3>
 Peter Bowen<BR>
+Jeremy Davis<BR>
 Jeff Finucane<BR>
 Jason Hall<BR>
 Kristian Hoffman<BR>
@@ -87,6 +87,7 @@ Gary Jones<BR>
 Fernando M. Kiernan<BR>
 Frederico Caldeira Knabben<BR>
 Greg Kuhnert<BR>
+Steven Levithan<BR>
 Randall Lucas<BR>
 Foteos Macrides<BR>
 Roger Mangraviti<BR>
@@ -95,6 +96,7 @@ Mack Nagashima<BR>
 David Peters<BR>
 Matt Peterson<BR>
 Luke Pfeifer<BR>
+Alan Phipps<BR>
 Ricardo Signes<BR>
 Steve Simitzis<BR>
 Stanislav Sinyagin<BR>
@@ -109,7 +111,7 @@ Johan Vromans<BR>
 Peter Wemm<BR>
 Mark Williamson<BR>
 Tim Yardley<BR>
-
+Jörn Zaefferer<BR>
 </CENTER>
 
 <BR>