]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorAnatol Belski <ab@php.net>
Wed, 10 Apr 2013 18:51:58 +0000 (20:51 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Apr 2013 18:51:58 +0000 (20:51 +0200)

Trivial merge