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

Merge branch 'PHP-5.5'
---

a3c0942cb05ce7740e5b00fbb3039054b9f45c2c