From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 20 Oct 2015 15:14:08 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~922
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67b74b4f52d86b88e2b93af895c02df7682137c0;p=php

Merge branch 'PHP-7.0'
---

67b74b4f52d86b88e2b93af895c02df7682137c0