From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 28 Mar 2013 06:35:57 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=feefd2a8fdf8efb6abbd60a4c07f15fab25d7dcc;p=php

Merge branch 'PHP-5.5'
---

feefd2a8fdf8efb6abbd60a4c07f15fab25d7dcc