]> 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>
Sun, 30 Aug 2015 12:34:15 +0000 (05:34 -0700)
committerXinchen Hui <laruence@gmail.com>
Sun, 30 Aug 2015 12:34:15 +0000 (05:34 -0700)

Trivial merge