]> 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>
Mon, 28 Oct 2013 14:09:13 +0000 (15:09 +0100)
committerDerick Rethans <github@derickrethans.nl>
Mon, 28 Oct 2013 14:09:13 +0000 (15:09 +0100)

Trivial merge