From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 16 May 2016 13:24:34 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ed45fff1abd35a3fa89c591ad149f0670e83b31;p=php

Merge branch 'PHP-7.0'
---

8ed45fff1abd35a3fa89c591ad149f0670e83b31