]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/622' into PHP-5.6
authorYasuo Ohgaki <yohgaki@php.net>
Wed, 19 Mar 2014 08:29:24 +0000 (17:29 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Wed, 19 Mar 2014 08:29:24 +0000 (17:29 +0900)
* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding


Trivial merge