From: Xinchen Hui <laruence@php.net>
Date: Wed, 10 Apr 2013 05:48:38 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1643bd582ec73cc37403cc85bd3e56c3a1d9d04;p=php

Merge branch 'PHP-5.5'
---

d1643bd582ec73cc37403cc85bd3e56c3a1d9d04