]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorAnatol Belski <ab@php.net>
Sat, 1 Mar 2014 12:16:16 +0000 (13:16 +0100)
committerAnatol Belski <ab@php.net>
Sat, 1 Mar 2014 12:16:16 +0000 (13:16 +0100)

Trivial merge