]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 803cfe3 48df446)
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:38:15 +0000 (18:38 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:38:15 +0000 (18:38 +0200)
* PHP-5.4:
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530  error_log=syslog ignored"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.