]> granicus.if.org Git - php/commitdiff
Merge branch 'patch-5' of https://github.com/ovr/php-src
authorXinchen Hui <laruence@php.net>
Wed, 20 May 2015 08:56:28 +0000 (16:56 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 20 May 2015 08:56:28 +0000 (16:56 +0800)

Trivial merge