]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Sun, 4 Oct 2015 06:16:38 +0000 (23:16 -0700)
committerXinchen Hui <laruence@gmail.com>
Sun, 4 Oct 2015 06:16:38 +0000 (23:16 -0700)

Trivial merge