]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2198'
authorJoe Watkins <krakjoe@php.net>
Sat, 12 Nov 2016 08:15:13 +0000 (08:15 +0000)
committerJoe Watkins <krakjoe@php.net>
Sat, 12 Nov 2016 08:15:13 +0000 (08:15 +0000)

Trivial merge