From: Anatol Belski <ab@php.net>
Date: Mon, 14 Mar 2016 14:58:40 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~487
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8309e12cc7fa2ff0d6786f24e580c09702c2f945;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix test
  Update NEWS
---

8309e12cc7fa2ff0d6786f24e580c09702c2f945