]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Mon, 29 Feb 2016 21:44:06 +0000 (22:44 +0100)
committerNikita Popov <nikic@php.net>
Mon, 29 Feb 2016 21:44:46 +0000 (22:44 +0100)
commita6afaa9a85e3ba48d8b58fd1fbfae8d84892abb5
treed5a6a09d0e37d17061c62f3e442e5774e817556b
parent31dc08a904f2a91b582396b6ba118abfd12cf246
parent50b4cafd286eb9d96d71df04e8dc46d321d420b5
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/phar/tar.c
NEWS
ext/phar/tar.c