From: Xinchen Hui <laruence@php.net>
Date: Thu, 28 Mar 2013 15:24:17 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5678ada68ed5bcf8908da99bfcbd24b05ac6fcc2;p=php

Merge branch 'PHP-5.5'
---

5678ada68ed5bcf8908da99bfcbd24b05ac6fcc2