From: Xinchen Hui <laruence@php.net>
Date: Fri, 5 Sep 2014 01:22:23 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59f10e4ca06e1de4de1b23a71768da717df267c6;p=php

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

59f10e4ca06e1de4de1b23a71768da717df267c6