From: Xinchen Hui <laruence@php.net>
Date: Tue, 5 Mar 2013 08:57:37 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09e9c294b8b41ee02ff392816751f262205f93ea;p=php

Merge branch 'PHP-5.5'
---

09e9c294b8b41ee02ff392816751f262205f93ea