diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-05-07 00:38:57 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-05-07 00:38:57 +0200 |
| commit | d2f283884f068d8f5b0269782876a28c0a41c9bb (patch) | |
| tree | f879f2016babc613029bebef3b7c7fa40c7d089c /sapi/phpdbg/phpdbg_help.c | |
| parent | 78cb0c1dbc00e5c10830a622c458958e4559d7d1 (diff) | |
| parent | 579898e3382ae975ab1cc03738676e4e6582bf89 (diff) | |
| download | php-git-d2f283884f068d8f5b0269782876a28c0a41c9bb.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions