From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 23 Nov 2015 10:49:25 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~705^2~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ae9a6fca68fbd5c0829d491e0dc9fa2d42a034e;p=php

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

2ae9a6fca68fbd5c0829d491e0dc9fa2d42a034e