From: Xinchen Hui <laruence@php.net>
Date: Thu, 11 Apr 2013 06:29:09 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5cfe57e08f3d3e48276f535d12ce6e6758451bf;p=php

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

a5cfe57e08f3d3e48276f535d12ce6e6758451bf