From: Xinchen Hui <laruence@php.net>
Date: Mon, 10 Dec 2012 10:47:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha2~33^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1e401fb34764a7bb9501d9a083b2ce70ca18564;p=php

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

a1e401fb34764a7bb9501d9a083b2ce70ca18564