From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 23 Oct 2015 03:19:37 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~912
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40648d7fc8b1dab70704073d2b5d2f235ec0ec02;p=php

Merge branch 'PHP-7.0'
---

40648d7fc8b1dab70704073d2b5d2f235ec0ec02