]> granicus.if.org Git - php/commit
Fix bad merge into master
authorBob Weinand <bobwei9@hotmail.com>
Thu, 28 Apr 2016 17:32:14 +0000 (19:32 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 28 Apr 2016 17:32:14 +0000 (19:32 +0200)
commit2c8e4ba8f1f63429f5d0e08a4a0fc6d449ca801a
tree3257ef3663564609bcc921700caebee6334fab3b
parent357ee4305ea75e40991590d2d3425689f5defb68
Fix bad merge into master

This should only have been reverted in 7.0, but not for 7.1. (merge=ours??)
Added appropriate NEWS entry.
NEWS
Zend/tests/bug71428.1.phpt
Zend/tests/bug71428.3.phpt
Zend/tests/bug72119.phpt
Zend/zend_inheritance.c