From: Xinchen Hui <laruence@php.net>
Date: Thu, 28 Aug 2014 06:56:53 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=697472e3e1347da644e67ccbf06fc4d851537adc;p=php

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

697472e3e1347da644e67ccbf06fc4d851537adc