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

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

554e4206ab63812e0e0d35a97edd1571a4ebbbb9