From: Julien Pauli <jpauli@php.net>
Date: Thu, 24 Dec 2015 13:49:03 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a4993d0fb1055afd275da4aefd452dcd3656188;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test
---

2a4993d0fb1055afd275da4aefd452dcd3656188