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

Trivial merge