]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 3 May 2012 12:00:10 +0000 (20:00 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 3 May 2012 12:00:10 +0000 (20:00 +0800)
* origin/PHP-5.4:
  Fixed test bug #61892


Trivial merge