]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Sun, 20 Dec 2015 14:27:13 +0000 (15:27 +0100)
committerAnatol Belski <ab@php.net>
Sun, 20 Dec 2015 14:27:13 +0000 (15:27 +0100)
* PHP-7.0:
  Partially fix bug #71129
  Typo
  Bug #71105 was fixed in 7.0.1 (commit 9374ba35)

1  2 
Zend/zend.c

diff --cc Zend/zend.c
Simple merge