diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-05-07 00:38:32 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-05-07 00:38:32 +0200 |
| commit | 579898e3382ae975ab1cc03738676e4e6582bf89 (patch) | |
| tree | 5a61b96fb4f0fd325c308ee2ce3fd8671e6399ff /sapi/phpdbg/phpdbg_help.c | |
| parent | 58f4bf441a89bde7e91e3a8fdcd900cbc61df558 (diff) | |
| parent | f880013c4d0a65baa104c19cd8058a970295eb80 (diff) | |
| download | php-git-579898e3382ae975ab1cc03738676e4e6582bf89.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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