From: Remi Collet <remi@php.net>
Date: Wed, 16 Sep 2015 12:32:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e83c9b2e4d530e5bb1a90cafdd705ac3494d21a;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix regressio introduce in 22e23e7cb8ca9aa134d138b5fed031af6c842b44
---

8e83c9b2e4d530e5bb1a90cafdd705ac3494d21a