]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)
committerNikita Popov <nikic@php.net>
Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)
commit85867268fdae2b742ce44bc76b7b57053d5063a8
tree865037861c5f899bb5cbc997d606c70f1eb8ce33
parent77bb96d7c95ddfdba8b16325db439913ee58522f
parentc4f69b6dfd6a27767e36312f7cb8474458a13ca6
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_compile.c