From: Anatol Belski <ab@php.net>
Date: Sat, 7 Jan 2017 11:44:56 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9845155aa2271b4d2a2f8d81e6a43cde8b11e4fe;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix wrong version
  extend UPGRADING
---

9845155aa2271b4d2a2f8d81e6a43cde8b11e4fe