]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorYasuo Ohgaki <yohgaki@php.net>
Thu, 8 Sep 2016 04:32:47 +0000 (13:32 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Thu, 8 Sep 2016 04:32:47 +0000 (13:32 +0900)
commit1ecf361c158dcbe5276d8894ac5e2d05f454da71
treeb0bbd10cf321deacfe83c6cb4932121caeb9964d
parent6aa07c908309c3ce0b2c37c120ff8f2e734bde1a
parent379d9a1cfc64626d3d7627aaf53c22cb950ec343
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
ext/mbstring/mbstring.c