From: Xinchen Hui <laruence@php.net>
Date: Thu, 3 May 2012 14:40:51 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~206^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b16f7cd690ecd9a32723c69d90888401c83914b;p=php

Merge branch 'PHP-5.4'
---

6b16f7cd690ecd9a32723c69d90888401c83914b