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

Trivial merge