]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/1816'
authorJoe Watkins <krakjoe@php.net>
Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)

Trivial merge