]> 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>
Wed, 16 May 2012 14:46:08 +0000 (16:46 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:46:08 +0000 (16:46 +0200)
* 'PHP-5.3' of git.php.net:/php-src:
  Fix for bug#62046


Trivial merge