]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorKalle Sommer Nielsen <kalle@php.net>
Sat, 12 Nov 2016 10:18:42 +0000 (11:18 +0100)
committerKalle Sommer Nielsen <kalle@php.net>
Sat, 12 Nov 2016 10:18:42 +0000 (11:18 +0100)

Trivial merge