From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 15 Nov 2015 02:42:23 +0000 (-0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~748^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bf3c1481fb1f3ed751954d6c2ce0fa4319504ce;p=php

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

4bf3c1481fb1f3ed751954d6c2ce0fa4319504ce