]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorRasmus Lerdorf <rasmus@php.net>
Thu, 20 Sep 2012 18:22:55 +0000 (14:22 -0400)
committerRasmus Lerdorf <rasmus@php.net>
Thu, 20 Sep 2012 18:22:55 +0000 (14:22 -0400)

Trivial merge