From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 27 Nov 2015 15:31:53 +0000 (-0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha2~40^2~26^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=229351cca29ac420900a9a826fb1effc7e501f73;p=php

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

229351cca29ac420900a9a826fb1effc7e501f73