]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8b9708 e55c641)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Fri, 29 Aug 2014 06:12:41 +0000 (23:12 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 29 Aug 2014 06:12:41 +0000 (23:12 -0700)
* PHP-5.5:
  fix NEWS for fcgi fix merge
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606


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