From: Xinchen Hui <laruence@php.net>
Date: Fri, 25 Jul 2014 02:52:46 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~57^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bad5502ca9b2bf3d6e9f4583a343a09fc862c0f6;p=php

Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
---

bad5502ca9b2bf3d6e9f4583a343a09fc862c0f6