]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Thu, 3 Apr 2014 08:41:24 +0000 (10:41 +0200)
committerMichael Wallner <mike@php.net>
Thu, 3 Apr 2014 08:41:24 +0000 (10:41 +0200)
* PHP-5.5:
  NEWS
  Fix Bug #66736  fpassthru broken

1  2 
main/streams/streams.c

Simple merge