]> granicus.if.org Git - php/commitdiff
Merge branch 'patch-1' of https://github.com/colinodell/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Sun, 8 Nov 2015 07:06:41 +0000 (23:06 -0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 8 Nov 2015 07:06:41 +0000 (23:06 -0800)

Trivial merge