From: Xinchen Hui <laruence@php.net>
Date: Tue, 26 Mar 2013 04:03:37 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~86^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2afd2765bb26f25f265c3c76a1e9918b2f341e2;p=php

Merge branch 'PHP-5.5'
---

c2afd2765bb26f25f265c3c76a1e9918b2f341e2