]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
authorDerick Rethans <github@derickrethans.nl>
Sun, 6 Jan 2013 15:10:16 +0000 (15:10 +0000)
committerDerick Rethans <github@derickrethans.nl>
Sun, 6 Jan 2013 15:10:16 +0000 (15:10 +0000)

Trivial merge