From: Xinchen Hui <laruence@php.net>
Date: Thu, 3 May 2012 10:41:45 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~238^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=604d11ee6c267dcf5c886c68acc645a298f4d64e;p=php

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

604d11ee6c267dcf5c886c68acc645a298f4d64e