Merge branch 'PHP-5.5' into PHP-5.6
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:15 +0000 (06:25 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:15 +0000 (06:25 +0900)
* PHP-5.5:
  Revise encoding blacklist

1  2 
ext/pgsql/pgsql.c

Simple merge