]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJoe Watkins <krakjoe@php.net>
Mon, 28 Mar 2016 10:55:03 +0000 (11:55 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 28 Mar 2016 10:55:03 +0000 (11:55 +0100)
* PHP-7.0:
  work on #71428

1  2 
Zend/zend_inheritance.c

Simple merge