From: Anatoliy Belsky Date: Thu, 12 Jul 2012 09:02:33 +0000 (+0200) Subject: Merge branch 'PHP-5.4' X-Git-Tag: php-5.5.0alpha1~85 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed1f5b4dae81316ad53cee5c8cfa7e7f7746ad46;p=php Merge branch 'PHP-5.4' * PHP-5.4: reverted news about #62477 reverted changes for #62477 Conflicts: NEWS --- ed1f5b4dae81316ad53cee5c8cfa7e7f7746ad46