]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Thu, 14 Nov 2013 18:53:02 +0000 (10:53 -0800)
committerAdam Harvey <aharvey@php.net>
Thu, 14 Nov 2013 18:53:02 +0000 (10:53 -0800)

Trivial merge