From: Anatol Belski Date: Tue, 23 Jul 2013 08:00:07 +0000 (+0200) Subject: Merge branch 'PHP-5.4' into PHP-5.5 X-Git-Tag: php-5.5.2RC1~11^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aebe0f1e7003301091e91730ce50a58dc7285cb;p=php Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt --- 8aebe0f1e7003301091e91730ce50a58dc7285cb