]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorKalle Sommer Nielsen <kalle@php.net>
Thu, 20 Oct 2016 12:28:52 +0000 (14:28 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Thu, 20 Oct 2016 12:28:52 +0000 (14:28 +0200)

Trivial merge