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

Merge branch 'PHP-7.0'
---

42252f409b355b2d0498c6b66834eff72b040acb