From: Anatol Belski <ab@php.net>
Date: Sun, 4 Dec 2016 13:02:37 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfd776b32656e573bea6141d63df6f05a396e69f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  enforce the test ini usage for the child process
---

dfd776b32656e573bea6141d63df6f05a396e69f