From: Matteo Beccati <mbeccati@php.net>
Date: Thu, 15 Dec 2016 08:32:04 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72fb941bd47aeaa8fd4100aacc945e5372984ac2;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Skip tests when secure_file_priv dir not writable
  Add missing UPGRADING entry. Manual is updated before 7.0 release.
---

72fb941bd47aeaa8fd4100aacc945e5372984ac2