]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJohannes Schlüter <johannes@php.net>
Wed, 7 Dec 2016 16:50:40 +0000 (17:50 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 7 Dec 2016 16:50:40 +0000 (17:50 +0100)

Trivial merge