From: Xinchen Hui <laruence@php.net>
Date: Sun, 3 Mar 2013 03:25:49 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~500^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b572f07b6f4890789fa3c53f2e69f744a0fde15b;p=php

Merge branch 'PHP-5.5'
---

b572f07b6f4890789fa3c53f2e69f744a0fde15b