]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Fri, 18 Dec 2015 09:44:05 +0000 (17:44 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 18 Dec 2015 09:44:05 +0000 (17:44 +0800)
* PHP-5.6:


Trivial merge