From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sat, 15 Feb 2014 21:25:15 +0000 (+0900)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53f34bca76d155a7368522427f7bf3b6f9c9e7ef;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revise encoding blacklist
---

53f34bca76d155a7368522427f7bf3b6f9c9e7ef