]> granicus.if.org Git - php/commitdiff
Merge branch 'pr-765' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Tue, 12 Aug 2014 12:47:03 +0000 (14:47 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 12 Aug 2014 12:47:03 +0000 (14:47 +0200)
* pr-765:
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"

1  2 
NEWS

diff --cc NEWS
Simple merge