From: Anatol Belski <ab@php.net>
Date: Tue, 21 Jun 2016 15:25:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdd127528e948d49174515d197baafb2060d4794;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix two remaining tests
---

bdd127528e948d49174515d197baafb2060d4794