diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 18:38:54 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 18:38:54 +0200 |
| commit | d810c2139fa16953d1a1661e8616046716dd247c (patch) | |
| tree | a4239a91684ab732cf3e64e29bfd0197bbfe43a4 /sapi/phpdbg/phpdbg_lexer.c | |
| parent | 3ec93ee19f174f27285872515d236028f0e079f9 (diff) | |
| parent | e5fdb5b3f02fcb61efa5aa7d6e5ccd15838470a2 (diff) | |
| download | php-git-d810c2139fa16953d1a1661e8616046716dd247c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
Diffstat (limited to 'sapi/phpdbg/phpdbg_lexer.c')
0 files changed, 0 insertions, 0 deletions