]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorPierre Joye <pierre.php@gmail.com>
Tue, 7 Jun 2016 10:39:22 +0000 (17:39 +0700)
committerPierre Joye <pierre.php@gmail.com>
Tue, 7 Jun 2016 10:39:22 +0000 (17:39 +0700)

Trivial merge