From: Xinchen Hui <laruence@php.net>
Date: Tue, 26 Mar 2013 03:47:38 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta2~9^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62ec3893d2cc58b21df9c1269507ba5dcde5a768;p=php

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

62ec3893d2cc58b21df9c1269507ba5dcde5a768