From: Xinchen Hui <laruence@php.net>
Date: Tue, 14 Aug 2012 06:03:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80912569488dacef806db6be11494f0064f5a1b8;p=php

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

80912569488dacef806db6be11494f0064f5a1b8