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

Merge branch 'PHP-5.5'
---

b5e8597e5af4436961b45b9a4d972ffa875443d2