From: Thomas Punt <tpunt@php.net>
Date: Thu, 26 Apr 2018 20:09:08 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.6RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=972c4869a75eb3c5655f50c4d630160a6df4ee15;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Allocate default ini values into persistent memory
---

972c4869a75eb3c5655f50c4d630160a6df4ee15