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

Merge branch 'PHP-5.4'
---

d43a6cda42ca9a3222a387dd93f3ad78a6e5c985