]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Tue, 5 Jul 2016 12:31:32 +0000 (14:31 +0200)
committerNikita Popov <nikic@php.net>
Tue, 5 Jul 2016 12:32:38 +0000 (14:32 +0200)
commit8a555d7c66199c629cd4948d486ee45a8d6d412d
treeff6485fd2dd8d6cf9b21ca9dabeda9cd4046b3f5
parentadf0920065fc8d4eb5b81a4aa7c92e188eeebdb6
parent08777e9615868cf2acf4dc2a86a7ef21106beddd
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_compile.c
NEWS
Zend/zend_inheritance.c