From: Xinchen Hui <laruence@php.net>
Date: Mon, 24 Sep 2012 11:47:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~45^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a930c93dd673b9f13350590a7b6e3a1a5ce4431;p=php

Merge branch 'PHP-5.4'
---

8a930c93dd673b9f13350590a7b6e3a1a5ce4431