From: Anatol Belski <ab@php.net>
Date: Mon, 21 Nov 2016 21:59:30 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f5e49bdeb145e7f866229d593ceeef80b6669fc;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update php.ini-* for bug #69090
  update php.ini-* according to changes for bug #69090
---

2f5e49bdeb145e7f866229d593ceeef80b6669fc