]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:31:15 +0000 (17:31 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:31:15 +0000 (17:31 +0800)
* PHP-5.3:
  Fix test, and merge the modification from trunk


Trivial merge