From: Xinchen Hui <laruence@php.net>
Date: Mon, 10 Mar 2014 07:55:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa23d754a9aceb1312a847d588a152e224e08c5b;p=php

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

aa23d754a9aceb1312a847d588a152e224e08c5b