]> granicus.if.org Git - php/commitdiff
Merge branch 'bug69227' of https://github.com/Vektah/php-src into PHP-5.5
authorXinchen Hui <laruence@php.net>
Fri, 13 Mar 2015 16:42:36 +0000 (00:42 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 13 Mar 2015 16:42:36 +0000 (00:42 +0800)

Trivial merge