From: Xinchen Hui <laruence@php.net>
Date: Thu, 18 Oct 2012 12:13:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha1~22^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1478bbf9d7cd312607e829a32ed5582e386adac;p=php

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

f1478bbf9d7cd312607e829a32ed5582e386adac