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

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

5f969c1d465cd91ec3250905b0728fcd0fb6c395