granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: af3031d 8bbd095)

author	Yasuo Ohgaki <yohgaki@php.net>
	Thu, 8 Sep 2016 04:32:31 +0000 (13:32 +0900)
committer	Yasuo Ohgaki <yohgaki@php.net>
	Thu, 8 Sep 2016 04:32:31 +0000 (13:32 +0900)
commit	379d9a1cfc64626d3d7627aaf53c22cb950ec343
tree	452fd6984ca54fa9c0893ccc078f225b62867682	tree \| snapshot
parent	af3031d755801546cc52117c5f8c864c062248b8	commit \| diff
parent	8bbd0952e5bba88426bac1596dcc3bfa504dbe4e	commit \| diff

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset

ext/mbstring/mbstring.c

Unnamed repository; edit this file 'description' to name the repository.