]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorPierre Joye <pierre.php@gmail.com>
Tue, 19 Jul 2016 09:34:55 +0000 (16:34 +0700)
committerPierre Joye <pierre.php@gmail.com>
Tue, 19 Jul 2016 09:34:55 +0000 (16:34 +0700)

Trivial merge