]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Tue, 19 Aug 2014 05:45:28 +0000 (07:45 +0200)
committerAnatol Belski <ab@php.net>
Tue, 19 Aug 2014 05:45:28 +0000 (07:45 +0200)
# By Dmitry Stogov
# Via Dmitry Stogov
* 'master' of git.php.net:php-src:
  Fixed encoding support


Trivial merge