]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2152' into PHP-7.0
authorJoe Watkins <krakjoe@php.net>
Thu, 20 Oct 2016 04:19:10 +0000 (05:19 +0100)
committerJoe Watkins <krakjoe@php.net>
Thu, 20 Oct 2016 04:19:10 +0000 (05:19 +0100)

Trivial merge