]> 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>
Thu, 22 Jan 2015 09:04:33 +0000 (10:04 +0100)
committerAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:04:33 +0000 (10:04 +0100)

Trivial merge