From: Xinchen Hui <laruence@php.net>
Date: Mon, 30 Apr 2012 04:36:06 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ad91b23413371b5410848c0225b616d7a0d3b39;p=php

Merge remote-tracking branch 'origin/PHP-5.4'
---

1ad91b23413371b5410848c0225b616d7a0d3b39