From: Xinchen Hui <laruence@php.net>
Date: Tue, 1 Jan 2013 08:25:09 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.11RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58dabff8eda7089f70a826cab2ed7ba7d707974e;p=php

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

58dabff8eda7089f70a826cab2ed7ba7d707974e