From: Anatol Belski <ab@php.net>
Date: Thu, 18 Feb 2016 18:52:04 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~599
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7839ff5e2406b404173bb8818d60a8f7c6940e70;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  refix broken 20ca0b89bda3822001474514ab9dffd62c559f01
---

7839ff5e2406b404173bb8818d60a8f7c6940e70