From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 18 Apr 2016 11:14:30 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5d01ab5a1d3021376d8f01f9083d37356c190dd;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  combine conditions
---

b5d01ab5a1d3021376d8f01f9083d37356c190dd