From: Xinchen Hui <laruence@php.net>
Date: Mon, 20 Aug 2012 15:44:21 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc5631eca3e9aac195493a0edb7a730f3bc82a65;p=php

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

cc5631eca3e9aac195493a0edb7a730f3bc82a65