From: Xinchen Hui <laruence@php.net>
Date: Sun, 31 Mar 2013 13:26:26 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad7c0b19286a4dfa53d03a525ffee77c9ca92e04;p=php

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

ad7c0b19286a4dfa53d03a525ffee77c9ca92e04