From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 10 Dec 2015 13:47:36 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~679
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=412b7ace8fafbf1bce04f081e36d30363f1a48e1;p=php

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

412b7ace8fafbf1bce04f081e36d30363f1a48e1