]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorKalle Sommer Nielsen <kalle@php.net>
Tue, 25 Jul 2017 20:10:53 +0000 (22:10 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Tue, 25 Jul 2017 20:10:53 +0000 (22:10 +0200)

Trivial merge