]> granicus.if.org Git - php/commitdiff
Merge branch 'cleanup' of https://github.com/zxcvdavid/php-src
authorXinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 10:45:00 +0000 (18:45 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 10:45:00 +0000 (18:45 +0800)
1  2 
Zend/zend_inheritance.c

Simple merge