From: Xinchen Hui <laruence@php.net>
Date: Wed, 3 Apr 2013 02:21:24 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4799c8370b54ff5ad2e4fb4e4068eb0150303aac;p=php

Merge branch 'PHP-5.5'
---

4799c8370b54ff5ad2e4fb4e4068eb0150303aac