]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 17 Jan 2014 12:29:31 +0000 (20:29 +0800)
committerAdam Harvey <aharvey@php.net>
Fri, 17 Jan 2014 12:29:31 +0000 (20:29 +0800)

Trivial merge