]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Fri, 5 Aug 2016 21:09:30 +0000 (23:09 +0200)
committerNikita Popov <nikic@php.net>
Fri, 5 Aug 2016 21:09:30 +0000 (23:09 +0200)
commita2a2ea18feea8945be7a7f02f384f015fa47076a
tree72a46086bcc5ff500ab8e03f235d5db8a1816e8d
parent807e81937b290ddb71152196aae3bbaca9a53c7e
parent65056e9d6c74adef89332080b5458fd4850fb3b7
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/standard/ftp_fopen_wrapper.c
NEWS
ext/standard/ftp_fopen_wrapper.c