From: Xinchen Hui <laruence@php.net>
Date: Sun, 9 Jun 2013 14:25:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.17RC1~23^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f338510c94f71fdf5f0ea9990dfb36e9b4215028;p=php

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

f338510c94f71fdf5f0ea9990dfb36e9b4215028