]> 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>
Tue, 9 Apr 2013 04:47:21 +0000 (06:47 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 04:47:21 +0000 (06:47 +0200)

Trivial merge