From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 5 Apr 2013 06:27:29 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4d27a1557935b43430367b25fbeda906126a5d9;p=php

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

f4d27a1557935b43430367b25fbeda906126a5d9