From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 16 Nov 2015 09:02:55 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~748
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48325aba87636f15678c29af459f3df7ea873678;p=php

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

48325aba87636f15678c29af459f3df7ea873678