]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2158'
authorJoe Watkins <krakjoe@php.net>
Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)

Trivial merge