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

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

38150cbd7a527b8a322da5dd8786d461ec63b5fe