From: Xinchen Hui <laruence@php.net>
Date: Tue, 24 Jul 2012 05:39:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38fb89f91d7046d25cfe05ec7954a64f11ba755d;p=php

Merge branch 'PHP-5.4'
---

38fb89f91d7046d25cfe05ec7954a64f11ba755d