]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Mon, 25 Mar 2013 12:43:22 +0000 (13:43 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 25 Mar 2013 12:43:22 +0000 (13:43 +0100)

Trivial merge