From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 18 Dec 2015 16:20:18 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
X-Git-Tag: php-7.0.2RC1~11^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=916f10ac315bcca24d546404771792cc54b2168e;p=php

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
---

916f10ac315bcca24d546404771792cc54b2168e