From: Xinchen Hui <laruence@php.net>
Date: Thu, 3 Jul 2014 02:51:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC3~1^2~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ffd32b95249f1fde84ab5985222a785291d3d73;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

1ffd32b95249f1fde84ab5985222a785291d3d73