From: Xinchen Hui <laruence@php.net>
Date: Sat, 4 Aug 2012 03:29:56 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac88d108e651c1f0bcdb360b65b2689801e7a5f1;p=php

Merge branch 'PHP-5.4'
---

ac88d108e651c1f0bcdb360b65b2689801e7a5f1