From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 20 Apr 2016 15:43:54 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~289^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02e6808144830d0a029c53e7e73f79a93d26a669;p=php

Merge branch 'PHP-7.0'
---

02e6808144830d0a029c53e7e73f79a93d26a669