]> granicus.if.org Git - php/commit
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)
commit53f34bca76d155a7368522427f7bf3b6f9c9e7ef
tree04975e63ba2f11f2f67c7621fb029c61a992ac8a
parent1fd53fd2aeccd4503751f124ef92ed273181832b
parent8c9fd8fb534babc4b6fb0eee00dddb080cde83d7
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revise encoding blacklist
ext/pgsql/pgsql.c