From: Anatol Belski <ab@php.net>
Date: Fri, 4 Nov 2016 17:43:56 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC6~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86ae78d7c67cf9b43dbee0033557058e5901047f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  rename the tmp ini file, to keep it consistent with m4 variant
---

86ae78d7c67cf9b43dbee0033557058e5901047f