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

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

bbb4a44f987904846bcdb0ed461f1af8040ef872