From: Anatol Belski <ab@php.net>
Date: Wed, 3 Aug 2016 15:40:38 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta3~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8830b3d0202d8a02d97eba1ce6cfa552169b1376;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS
  update NEWS
  Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
---

8830b3d0202d8a02d97eba1ce6cfa552169b1376