]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJakub Zelenka <bukka@php.net>
Thu, 27 Apr 2017 14:11:52 +0000 (15:11 +0100)
committerJakub Zelenka <bukka@php.net>
Thu, 27 Apr 2017 14:11:52 +0000 (15:11 +0100)

Trivial merge