]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAdam Harvey <aharvey@php.net>
Tue, 11 Dec 2012 11:58:04 +0000 (19:58 +0800)
committerAdam Harvey <aharvey@php.net>
Tue, 11 Dec 2012 11:58:04 +0000 (19:58 +0800)

Trivial merge