From: Xinchen Hui <laruence@php.net>
Date: Fri, 23 Jan 2015 06:19:40 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~25^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad36fe34dfecb721b707fbf87049f4496b3637b1;p=php

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

ad36fe34dfecb721b707fbf87049f4496b3637b1