From: Xinchen Hui <laruence@php.net>
Date: Fri, 4 Jan 2013 03:05:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4f2a20f150c6e2b453cdd16f5ca1715ab150f7a;p=php

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

c4f2a20f150c6e2b453cdd16f5ca1715ab150f7a