From: Xinchen Hui <laruence@php.net>
Date: Thu, 21 Mar 2013 13:32:32 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=534aec8a52955b841e30428b5efd1eff975b5e0d;p=php

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

534aec8a52955b841e30428b5efd1eff975b5e0d