From: Xinchen Hui <laruence@php.net>
Date: Thu, 22 Mar 2012 09:31:15 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~44^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df129ae7ea983bab9947c97f15244870a748d729;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix test, and merge the modification from trunk
---

df129ae7ea983bab9947c97f15244870a748d729