]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Mon, 21 Dec 2015 11:10:49 +0000 (12:10 +0100)
committerAnatol Belski <ab@php.net>
Mon, 21 Dec 2015 11:10:49 +0000 (12:10 +0100)
* PHP-7.0:
  Revert "Partially fix bug #71129"

1  2 
Zend/zend.c

diff --cc Zend/zend.c
Simple merge