From: Xinchen Hui <laruence@php.net>
Date: Thu, 4 Apr 2013 11:31:21 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2794d455ea988772bed9baff91b21bdc4e00a195;p=php

Merge branch 'PHP-5.5'
---

2794d455ea988772bed9baff91b21bdc4e00a195