]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 11:50:59 +0000 (19:50 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 11:50:59 +0000 (19:50 +0800)
* PHP-5.4:
  Fix test (no charset outputed)


Trivial merge