]> 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>
Sat, 20 Apr 2013 16:24:04 +0000 (18:24 +0200)
committerPierre Joye <pierre.php@gmail.com>
Sat, 20 Apr 2013 16:24:04 +0000 (18:24 +0200)

Trivial merge