From: Anatol Belski <ab@php.net>
Date: Tue, 8 Mar 2016 12:16:46 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~522
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58c82ff0b0e5236e6ece2c289b07e1a831cb3fe2;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix regression introduced in 5683b6fa39
---

58c82ff0b0e5236e6ece2c289b07e1a831cb3fe2