]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Wed, 27 Jul 2016 13:56:52 +0000 (15:56 +0200)
committerNikita Popov <nikic@php.net>
Wed, 27 Jul 2016 13:58:06 +0000 (15:58 +0200)
commit0d2c4f822c614c544df736a30dffc00104fdbd57
tree937dbf79da9c7f5cdbbfbae1327a66516564fa67
parent6714f73545a8a186931f6fa91c23c4b700ba8ef7
parentcce457c68c3a15efafea3a30560c54f74f3f5ee1
Merge branch 'PHP-5.6' into PHP-7.0

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