]> granicus.if.org Git - php/commitdiff
Merge branch 'patch-1' of https://github.com/glensc/php-src
authorXinchen Hui <laruence@gmail.com>
Sat, 14 Nov 2015 09:43:38 +0000 (01:43 -0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 14 Nov 2015 09:43:38 +0000 (01:43 -0800)

Trivial merge