From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 27 Nov 2015 15:31:19 +0000 (-0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~26^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9a56e00f6e1ad5d80984545e6368c39c1d4b67c;p=php

Merge branch 'PHP-7.0'
---

f9a56e00f6e1ad5d80984545e6368c39c1d4b67c