]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:01 +0000 (06:25 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:01 +0000 (06:25 +0900)
commit8c9fd8fb534babc4b6fb0eee00dddb080cde83d7
treeb01f642de1d811e7307226b02438b148df3fc9d3
parenta65a54664066b69663d51726c64d3ff0e940f5c4
parent9f251548ae4875aa7714e81c79668cc231d7de6c
Merge branch 'PHP-5.4' into PHP-5.5

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