]> granicus.if.org Git - php/commitdiff
Merge branch 'zend_update_static_property' of https://github.com/dreamsxin/php-src
authorXinchen Hui <laruence@php.net>
Mon, 13 Jul 2015 08:02:21 +0000 (16:02 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 13 Jul 2015 08:02:21 +0000 (16:02 +0800)

Trivial merge