]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorKalle Sommer Nielsen <kalle@php.net>
Thu, 22 Dec 2016 04:47:00 +0000 (05:47 +0100)
committerKalle Sommer Nielsen <kalle@php.net>
Thu, 22 Dec 2016 04:47:00 +0000 (05:47 +0100)

Trivial merge