]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Wed, 12 Oct 2016 18:12:08 +0000 (20:12 +0200)
committerAnatol Belski <ab@php.net>
Wed, 12 Oct 2016 18:12:08 +0000 (20:12 +0200)

Trivial merge