From: Xinchen Hui <laruence@php.net>
Date: Thu, 22 Jan 2015 08:55:53 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~25^2~37^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc2572098696d0f0f707eeb9f182c0c760399569;p=php

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

fc2572098696d0f0f707eeb9f182c0c760399569