From: Xinchen Hui <laruence@php.net>
Date: Mon, 24 Sep 2012 03:00:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9ad532050c45e8b387407b42b7abc16cbffc63f;p=php

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	ext/standard/tests/general_functions/bug60723.phpt
---

d9ad532050c45e8b387407b42b7abc16cbffc63f