]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of https://github.com/kaplanlior/php-src into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Sat, 2 Jan 2016 09:48:20 +0000 (17:48 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 2 Jan 2016 09:48:20 +0000 (17:48 +0800)

Trivial merge