From: Xinchen Hui <laruence@php.net>
Date: Thu, 21 Mar 2013 03:14:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b29a9fa75d12c781495fdc271c5ed14901464898;p=php

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

b29a9fa75d12c781495fdc271c5ed14901464898