From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 1 Mar 2016 02:51:52 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~555
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42788d6b72a3bf066279576cd80d6d3cc23b7524;p=php

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

* 'master' of git.php.net:/php-src:
---

42788d6b72a3bf066279576cd80d6d3cc23b7524