From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 20 Nov 2016 07:46:53 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0~3^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f5d03025fd22bc3f7ce4bac17432c6c17c039d3;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
  Fix #73219 (fix acinclude when / is present)
  make it possible to show specific help pages without interactive session

Conflicts:
	acinclude.m4
---

0f5d03025fd22bc3f7ce4bac17432c6c17c039d3