From: Xinchen Hui <laruence@php.net>
Date: Wed, 8 Jul 2015 11:31:36 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.1RC1~35^2~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffccf19fa68eb853c341c0ecbe8fff9d05d05a28;p=php

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

ffccf19fa68eb853c341c0ecbe8fff9d05d05a28