]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorPierrick Charron <pierrick@php.net>
Wed, 27 Jul 2016 04:39:47 +0000 (00:39 -0400)
committerPierrick Charron <pierrick@php.net>
Wed, 27 Jul 2016 04:39:47 +0000 (00:39 -0400)
1  2 
main/streams/streams.c

Simple merge