]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Mon, 2 Feb 2015 11:31:54 +0000 (11:31 +0000)
committerAdam Harvey <aharvey@php.net>
Mon, 2 Feb 2015 11:31:54 +0000 (11:31 +0000)

Trivial merge