From: Xinchen Hui <laruence@php.net>
Date: Thu, 21 Feb 2013 10:21:19 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a05c6be41c294cae884f51ff53627760ad0e1d5;p=php

Merge branch 'PHP-5.5'
---

6a05c6be41c294cae884f51ff53627760ad0e1d5