]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 22:27:55 +0000 (15:27 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 22:27:55 +0000 (15:27 -0700)
* PHP-5.6:
  Fix bug #65701: Do not use cache for file file copy

1  2 
main/streams/streams.c

Simple merge