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

Merge branch 'PHP-5.4'
---

e904f9f4b2918798fb30b1b0b5c641e2ec84dd7a