]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Thu, 8 Sep 2016 15:53:21 +0000 (17:53 +0200)
committerAnatol Belski <ab@php.net>
Thu, 8 Sep 2016 15:53:21 +0000 (17:53 +0200)

Trivial merge