From: Xinchen Hui <laruence@php.net>
Date: Thu, 4 Apr 2013 06:48:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65e368debdbc0f321af95e402b0d151288018ba2;p=php

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

65e368debdbc0f321af95e402b0d151288018ba2