From: Anatol Belski <ab@php.net>
Date: Sat, 29 Oct 2016 15:57:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC6~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87cb91ea7c0c3b864042965b6b893a690df08df7;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix condition
---

87cb91ea7c0c3b864042965b6b893a690df08df7