From: Xinchen Hui <laruence@php.net>
Date: Mon, 1 Oct 2012 14:45:15 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~14^2~5^2~2^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a81d4310682f879aad5a156f8ac42e8080306082;p=php

Merge branch 'PHP-5.4'
---

a81d4310682f879aad5a156f8ac42e8080306082