From: Xinchen Hui <laruence@php.net>
Date: Wed, 18 Jul 2012 11:50:59 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=401230c7e181d97e9a8bf1abeeb294341c98727b;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix test (no charset outputed)
---

401230c7e181d97e9a8bf1abeeb294341c98727b