From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 29 Oct 2015 07:02:00 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~36^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f596c8a3e1b4fca155210c28e6f7789d18c5a6c4;p=php

Merge branch 'PHP-7.0'
---

f596c8a3e1b4fca155210c28e6f7789d18c5a6c4