]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorTjerk Meesters <datibbaw@php.net>
Sun, 2 Mar 2014 21:58:03 +0000 (05:58 +0800)
committerTjerk Meesters <datibbaw@php.net>
Sun, 2 Mar 2014 21:58:03 +0000 (05:58 +0800)

Trivial merge