From: Anatol Belski <ab@php.net>
Date: Wed, 6 Apr 2016 16:06:40 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~362
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31abb8ab50b24483327e5c828d4e7bbe83501576;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix merge mistake
---

31abb8ab50b24483327e5c828d4e7bbe83501576