From: Xinchen Hui <laruence@php.net>
Date: Tue, 14 Aug 2012 16:47:45 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e936f49b20b0973f993524429f160a5b8d33c01e;p=php

Merge branch 'PHP-5.4'
---

e936f49b20b0973f993524429f160a5b8d33c01e