From: Joe Watkins <krakjoe@php.net>
Date: Wed, 4 Jan 2017 14:36:37 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d514f235736f2648ccd86976a94b84e3ca35462c;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test
---

d514f235736f2648ccd86976a94b84e3ca35462c