From: Xinchen Hui <laruence@php.net>
Date: Fri, 16 Jan 2015 05:53:26 +0000 (-0500)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~25^2~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=584a43d601beb8e22da5b76c018d2e37cb23bda8;p=php

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

584a43d601beb8e22da5b76c018d2e37cb23bda8