From: Xinchen Hui <laruence@php.net>
Date: Thu, 21 Feb 2013 10:20:48 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f39d12c8210df2bc6dd0ead5d6bc63df63eea45f;p=php

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

f39d12c8210df2bc6dd0ead5d6bc63df63eea45f