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

Trivial merge