]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorGeorge Wang <gwang@php.net>
Fri, 3 Oct 2014 20:43:35 +0000 (16:43 -0400)
committerGeorge Wang <gwang@php.net>
Fri, 3 Oct 2014 20:43:35 +0000 (16:43 -0400)

Trivial merge