]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Tue, 21 Jun 2016 13:14:22 +0000 (15:14 +0200)
committerAnatol Belski <ab@php.net>
Tue, 21 Jun 2016 13:14:22 +0000 (15:14 +0200)

Trivial merge