]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Tue, 11 Mar 2014 18:07:21 +0000 (11:07 -0700)
committerAdam Harvey <aharvey@php.net>
Tue, 11 Mar 2014 18:07:21 +0000 (11:07 -0700)

Trivial merge