]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Sat, 2 Jan 2016 09:53:01 +0000 (17:53 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 2 Jan 2016 09:53:01 +0000 (17:53 +0800)

Trivial merge