]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
authorRasmus Lerdorf <rasmus@php.net>
Tue, 6 Nov 2012 04:58:04 +0000 (20:58 -0800)
committerRasmus Lerdorf <rasmus@php.net>
Tue, 6 Nov 2012 04:58:04 +0000 (20:58 -0800)

Trivial merge