]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 21 Nov 2014 00:19:36 +0000 (16:19 -0800)
committerAdam Harvey <aharvey@php.net>
Fri, 21 Nov 2014 00:19:36 +0000 (16:19 -0800)

Trivial merge