From: Xinchen Hui <laruence@php.net>
Date: Tue, 26 Mar 2013 03:51:15 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta2~9^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0496ad31acf067910c9d17117290d168617f845a;p=php

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

0496ad31acf067910c9d17117290d168617f845a