From: Xinchen Hui <laruence@php.net>
Date: Tue, 1 Jan 2013 08:31:06 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f01c295dc6271bc80b08b8d8ccbd9c931a1e500d;p=php

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

f01c295dc6271bc80b08b8d8ccbd9c931a1e500d