From: Xinchen Hui <laruence@php.net>
Date: Sun, 29 Jul 2012 06:31:04 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.6RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0c014deadc4d858507b83fab49e95b7f06954dc;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

e0c014deadc4d858507b83fab49e95b7f06954dc