- Merge: throw some credit around

diff --git a/ext/standard/credits.c b/ext/standard/credits.c
index e9c1d977b69ad133e903ce4b6721a98bc49f4180..2ccfef06ae5bb833a99f946f10a3ed794d2e2ff0 100644 (file)
--- a/ext/standard/credits.c
+++ b/ext/standard/credits.c
@@ -109,10 +109,17 @@ PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */
        }
 
        if (flag & PHP_CREDITS_WEB) {
-               /* Website Team */
+               /* Websites and infrastructure */
+
                php_info_print_table_start();
-               php_info_print_table_header(1, "PHP Website Team");
-               php_info_print_table_row(1, "Rasmus Lerdorf, Hannes Magnusson, Philip Olson");
+               php_info_print_table_colspan_header(2, "Websites and Infrastructure team");
+               /* www., wiki., windows., master., and others, I guess pecl. too? */
+               CREDIT_LINE("PHP Websites Team", "Rasmus Lerdorf, Hannes Magnusson, Philip Olson, Lukas Kahwe Smith, Pierre-Alain Joye, Kalle Sommer Nielsen");
+               CREDIT_LINE("Event Maintainers", "Damien Seguy, Daniel P. Brown");
+               /* Mirroring */
+               CREDIT_LINE("Network Infrastructure", "Daniel P. Brown");
+               /* Windows build boxes and such things */
+               CREDIT_LINE("Windows Infrastructure", "Alex Schoenmaker");
                php_info_print_table_end();
        }