]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Thu, 28 Apr 2016 16:57:59 +0000 (19:57 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 28 Apr 2016 16:57:59 +0000 (19:57 +0300)
* PHP-7.0:
  Fixed BC break described by bug #72119. It was introduced after 7.0.5 release by attempt to fix bug #71428.

1  2 
Zend/zend_inheritance.c

Simple merge