Merge branch 'PHP-5.6' into PHP-7.0

author Anatol Belski <ab@php.net>

Mon, 6 Jun 2016 05:33:36 +0000 (07:33 +0200)

committer Anatol Belski <ab@php.net>

Mon, 6 Jun 2016 05:33:36 +0000 (07:33 +0200)
author Anatol Belski <ab@php.net>
Mon, 6 Jun 2016 05:33:36 +0000 (07:33 +0200)
committer Anatol Belski <ab@php.net>
Mon, 6 Jun 2016 05:33:36 +0000 (07:33 +0200)
diff --cc ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 6 Jun 2016 05:33:36 +0000 (07:33 +0200)
committer	Anatol Belski <ab@php.net>
	Mon, 6 Jun 2016 05:33:36 +0000 (07:33 +0200)