From: Xinchen Hui <laruence@php.net>
Date: Sun, 9 Jun 2013 14:26:18 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~442^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c7440b81066b260a0fb3c8b40c62395d15effc;p=php

Merge branch 'PHP-5.5'
---

00c7440b81066b260a0fb3c8b40c62395d15effc