]> granicus.if.org Git - php/commitdiff
Merge branch 'php-5.5' into PHP-5.6
authorTjerk Meesters <datibbaw@php.net>
Tue, 11 Mar 2014 11:16:13 +0000 (19:16 +0800)
committerTjerk Meesters <datibbaw@php.net>
Tue, 11 Mar 2014 11:16:13 +0000 (19:16 +0800)

Trivial merge