diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 18:38:15 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 18:38:15 +0200 |
| commit | af9ce6e65045d5fe3cc626ab9c9fdd60fd420d3a (patch) | |
| tree | 21fea4f2e1db54ae564966556b9d8cec09b55793 /ext/mysqlnd/mysqlnd.c | |
| parent | 803cfe32e657c3c3f3776f1470fd598f5e6a107a (diff) | |
| parent | 48df4464eae716dfe42403c94989ecd3104f21c5 (diff) | |
| download | php-git-af9ce6e65045d5fe3cc626ab9c9fdd60fd420d3a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
0 files changed, 0 insertions, 0 deletions