]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Mon, 16 Nov 2015 09:00:16 +0000 (17:00 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 16 Nov 2015 09:00:16 +0000 (17:00 +0800)

Trivial merge