summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-07-02 23:36:00 +0200
committerFerenc Kovacs <tyrael@php.net>2014-07-02 23:36:00 +0200
commita1c63413cdbef2b9137e82d1e4abd8b9f82f28de (patch)
treef758e9703379dcdce7e5cf653815f7d236be91e6
parentf9b3494d991baf88e48349582c4681f40629b966 (diff)
parent6ca71b451e3e2a31cd01fb2d8d672a637aaaf8b2 (diff)
downloadphp-git-a1c63413cdbef2b9137e82d1e4abd8b9f82f28de.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: also add Remi to the QA credits add Stas and Julient to the QA credits
-rw-r--r--ext/standard/credits.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/credits.c b/ext/standard/credits.c
index 8c81d615b1..3cb6eef724 100644
--- a/ext/standard/credits.c
+++ b/ext/standard/credits.c
@@ -105,7 +105,7 @@ PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */
if (flag & PHP_CREDITS_QA) {
php_info_print_table_start();
php_info_print_table_header(1, "PHP Quality Assurance Team");
- php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens, Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn, Derick Rethans, Melvyn Sopacua, Jani Taskinen, Pierre-Alain Joye, Dmitry Stogov, Felipe Pena, David Soria Parra, Stephen Zarkos, Anatol Belski, Ferenc Kovacs");
+ php_info_print_table_row(1, "Ilia Alshanetsky, Joerg Behrens, Antony Dovgal, Stefan Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn, Derick Rethans, Melvyn Sopacua, Jani Taskinen, Pierre-Alain Joye, Dmitry Stogov, Felipe Pena, David Soria Parra, Stanislav Malyshev, Julien Pauli, Stephen Zarkos, Anatol Belski, Remi Collet, Ferenc Kovacs");
php_info_print_table_end();
}