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

diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index b5ed451..232adcf 100644 (file)
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -71,6 +71,7 @@ Dave Denney<BR>
 Serge Dolgov<BR>
 Scott Edwards<BR>
 Kenny Elliott<BR>
+Joshua Goodman<BR>
 Donald Greer<BR>
 Joel Griffiths<BR>
 Brian Grinstead<BR>
@@ -99,7 +100,9 @@ Stanislav Sinyagin<BR>
 Jason Spence<BR>
 James Switzer<BR>
 Audrey Tang<BR>
+Jason Terry<BR>
 Jason Thomas<BR>
+Rob Van Dam<BR>
 Jesse Vincent<BR>
 Johan Vromans<BR>
 Peter Wemm<BR>