From: Xinchen Hui <laruence@php.net>
Date: Sun, 6 Jan 2013 02:20:00 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~14^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2f8e9050439a2987d18a8ec4c060805ddc0dc8a;p=php

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

c2f8e9050439a2987d18a8ec4c060805ddc0dc8a