]> granicus.if.org Git - php/commit
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)
commit55005c86383f4616a2ca02333af9630f617a1a2e
tree6c9dfa69ce9c6c025cb0c0d18cee3d0b294f1b27
parent1c2bcec68a260502b72bda9eb8a1e9c3ef4ddafe
parent60ef357ffcc0335ff728cef498bfc9e06773fd3a
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix Bug #66736  fpassthru broken
main/streams/streams.c