Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikita.ppv@gmail.com>

Wed, 2 Aug 2017 16:08:58 +0000 (18:08 +0200)

committer Nikita Popov <nikita.ppv@gmail.com>

Wed, 2 Aug 2017 16:09:09 +0000 (18:09 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Wed, 2 Aug 2017 16:08:58 +0000 (18:08 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Wed, 2 Aug 2017 16:09:09 +0000 (18:09 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/mbstring/mbstring.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 2 Aug 2017 16:08:58 +0000 (18:08 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 2 Aug 2017 16:09:09 +0000 (18:09 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mbstring/mbstring.c	patch \|	diff1 \|	diff2 \|	blob \| history