]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 8 Jul 2014 07:57:36 +0000 (09:57 +0200)
committerAnatol Belski <ab@php.net>
Tue, 8 Jul 2014 07:57:36 +0000 (09:57 +0200)
commit8b3cc726be43910de5b0d782c5922534b2deef71
tree34d34543a585903ae61706ed1fbf169cb0eae9c9
parent208ae5498db6787826a143f158b9fdf586d3bd19
parent51f79846bf5b8829a7fd70b03c278bdd88e5fbce
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530  error_log=syslog ignored

Conflicts:
sapi/fpm/fpm/fpm_stdio.c
ext/standard/info.c