From: Xinchen Hui <laruence@php.net>
Date: Thu, 28 Mar 2013 05:54:37 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~72^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae71c1d9aa84dd400497400e58e45f24a4702602;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

ae71c1d9aa84dd400497400e58e45f24a4702602