]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b38ca3a b206b0e)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 29 Aug 2014 06:11:08 +0000 (23:11 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 29 Aug 2014 06:11:55 +0000 (23:11 -0700)
commite55c641792df2caf813b5df3272144974e4d8fc7
tree177ae3952b0f1d5457961353ab57da4cb4712ccdtree | snapshot
parentb38ca3adeeee502d2fb1be9b8956c60a3d7c1f0ecommit | diff
parentb206b0e29d2cf9a41b94befedfefd806a71d0846commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS for fcgi fix merge
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
NEWS diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.