]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:27 +0000 (06:25 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:27 +0000 (06:25 +0900)
commitd10e83cf89bab6c158318bf4343e6ee774419427
tree3499640ec6b103c37dea1c3fa46ce7bb03781d39
parentbc4e9d36a6a01d2f4f4026b2bd4bd7fbe57adef3
parent53f34bca76d155a7368522427f7bf3b6f9c9e7ef
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revise encoding blacklist