From: Anatol Belski <ab@php.net>
Date: Thu, 14 Jan 2016 17:41:22 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.2.0alpha1~620^2~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=242775a19b30dcf5a76e827b3c59b712b833d7f1;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  port 4308c868f94df1f2b99e80038ba5ea1076d919a7 to 7.0
---

242775a19b30dcf5a76e827b3c59b712b833d7f1