]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Wed, 19 Mar 2014 13:25:06 +0000 (06:25 -0700)
committerAdam Harvey <aharvey@php.net>
Wed, 19 Mar 2014 13:25:06 +0000 (06:25 -0700)

Trivial merge