From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 23 Nov 2015 04:40:54 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~705^2~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bd231c0a01f3782aad140b637d2185b745c679d;p=php

Merge branch 'PHP-7.0'
---

3bd231c0a01f3782aad140b637d2185b745c679d