From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 14 Dec 2015 09:15:03 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=732fe984f2e49a33ad995c03815b5d5ebe29fc60;p=php

Merge branch 'master' of git.php.net:/php-src
---

732fe984f2e49a33ad995c03815b5d5ebe29fc60