From: Xinchen Hui <laruence@php.net>
Date: Fri, 4 Jan 2013 03:03:52 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~17^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aff5d084a5c1a8efeeb81d1fc9c5e56692543a0b;p=php

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

aff5d084a5c1a8efeeb81d1fc9c5e56692543a0b