]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorReeze Xia <reeze@php.net>
Thu, 5 Nov 2015 06:28:49 +0000 (14:28 +0800)
committerReeze Xia <reeze@php.net>
Thu, 5 Nov 2015 06:28:49 +0000 (14:28 +0800)
* PHP-5.6:
  Make test for bug #70852 to cover all cases
  Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.


Trivial merge