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

Merge branch 'PHP-5.6' into PHP-7.0

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

0e82eb48cbf222563bef5d890978018982b06b73