]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 13:39:16 +0000 (15:39 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 13:39:16 +0000 (15:39 +0200)
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)

1  2 
main/streams/streams.c

Simple merge