]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorPierrick Charron <pierrick@php.net>
Wed, 27 Jul 2016 22:26:19 +0000 (18:26 -0400)
committerPierrick Charron <pierrick@php.net>
Wed, 27 Jul 2016 22:26:19 +0000 (18:26 -0400)

Trivial merge