From: Xinchen Hui <laruence@php.net>
Date: Wed, 5 Sep 2012 15:42:45 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~36^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9dec59b07d9b3a12767a0f8cc3bc7a069c386e9;p=php

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

b9dec59b07d9b3a12767a0f8cc3bc7a069c386e9