]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
authorJohannes Schlüter <johannes@php.net>
Thu, 30 Aug 2012 19:54:13 +0000 (21:54 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 30 Aug 2012 19:54:13 +0000 (21:54 +0200)

Trivial merge