From: Xinchen Hui <laruence@php.net>
Date: Wed, 3 Apr 2013 02:20:52 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0495061a8f6d5c50712ea77f799c4e3b2acde02e;p=php

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

0495061a8f6d5c50712ea77f799c4e3b2acde02e