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

Merge branch 'PHP-5.5'
---

0cdd4e83bdafd6bf935beecc9130e1e83c97b9e6