From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sat, 15 Feb 2014 21:25:01 +0000 (+0900)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c9fd8fb534babc4b6fb0eee00dddb080cde83d7;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revise encoding blacklist
---

8c9fd8fb534babc4b6fb0eee00dddb080cde83d7