]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ec93ee e5fdb5b)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:38:54 +0000 (18:38 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:38:54 +0000 (18:38 +0200)
commitd810c2139fa16953d1a1661e8616046716dd247c
treea4239a91684ab732cf3e64e29bfd0197bbfe43a4tree | snapshot
parent3ec93ee19f174f27285872515d236028f0e079f9commit | diff
parente5fdb5b3f02fcb61efa5aa7d6e5ccd15838470a2commit | diff
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"
sapi/fpm/fpm/fpm_stdio.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.