From: Xinchen Hui <laruence@php.net>
Date: Sun, 24 Feb 2013 04:59:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e75804c34ef60e22db79850dc1f77948e6b51ea3;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

e75804c34ef60e22db79850dc1f77948e6b51ea3