From: Xinchen Hui <laruence@php.net>
Date: Mon, 1 Apr 2013 10:17:28 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b504a371734cec343a5b17adc019b54f474b2a9;p=php

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

3b504a371734cec343a5b17adc019b54f474b2a9